mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-15 09:34:50 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ed24e1e1f0 | ||
|
|
76e50f8a32 |
No files matched your search
+1
-1
@@ -15,7 +15,7 @@ dependencies {
|
||||
compileOnly("com.github.GTNewHorizons:Backhand:1.8.4:dev") { transitive = false }
|
||||
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-812-GTNH:api') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.261:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.576:dev') {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:ModularUI2:2.3.37-1.7.10:dev") {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:Railcraft:9.17.17:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.9-GTNH:api') {transitive = false}
|
||||
|
||||
@@ -85,6 +85,6 @@ public class ItemEndSteelArmor extends ItemDarkSteelArmor implements IEndSteelIt
|
||||
@Optional.Method(modid = "gregtech_nh")
|
||||
@Override
|
||||
public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) {
|
||||
return true;
|
||||
return Hazard.STANDARD_HAZARDS.contains(hazard);
|
||||
}
|
||||
}
|
||||
@@ -3,10 +3,8 @@ package crazypants.enderio.machine.obelisk.weather;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.particle.EntityFireworkSparkFX;
|
||||
import net.minecraft.entity.item.EntityFireworkRocket;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldServer;
|
||||
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
@@ -53,12 +51,9 @@ public class EntityWeatherRocket extends EntityFireworkRocket {
|
||||
public void setDead() {
|
||||
super.setDead();
|
||||
|
||||
WeatherTask task = WeatherTask.values()[getDataWatcher().getWatchableObjectInt(DATA_ID)];
|
||||
MinecraftServer server = MinecraftServer.getServer();
|
||||
|
||||
if (server != null && server.worldServers.length > 0) {
|
||||
WorldServer worldserver = server.worldServers[0];
|
||||
task.complete(worldserver);
|
||||
if (!worldObj.isRemote) {
|
||||
WeatherTask task = WeatherTask.values()[getDataWatcher().getWatchableObjectInt(DATA_ID)];
|
||||
task.complete(worldObj);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user