diff options
| author | John <Techlone@users.noreply.github.com> | 2017-01-19 20:59:33 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 20:59:33 +0500 |
| commit | cb4111d405ecaaa0fb81f891cf7006e9f4fd828c (patch) | |
| tree | 1e09cea07727a9cc0eac9e679d254dd07b6a104d | |
| parent | 90442a8d911523feecf020b833d161fd44ff46a3 (diff) | |
| parent | 65c5813ae3d5dc735d1a61868a0313ac177d80f5 (diff) | |
| download | GT5-Unofficial-cb4111d405ecaaa0fb81f891cf7006e9f4fd828c.tar.gz GT5-Unofficial-cb4111d405ecaaa0fb81f891cf7006e9f4fd828c.tar.bz2 GT5-Unofficial-cb4111d405ecaaa0fb81f891cf7006e9f4fd828c.zip | |
Merge pull request #5 from Blood-Asp/unstable
Update
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java | 27 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/armor/ModularArmor_Item.java | 2 |
2 files changed, 24 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 60e918de4c..3b2f37085a 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -66,6 +66,26 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE private String mOwnerName = ""; private NBTTagCompound mRecipeStuff = new NBTTagCompound(); + private static final Field ENTITY_ITEM_HEALTH_FIELD; + static + { + Field f = null; + + try { + f = EntityItem.class.getDeclaredField("field_70291_e"); + f.setAccessible(true); + } catch (Exception e1) { + try { + f = EntityItem.class.getDeclaredField("health"); + f.setAccessible(true); + } catch (Exception e2) { + e1.printStackTrace(); + e2.printStackTrace(); + } + } + ENTITY_ITEM_HEALTH_FIELD = f; + } + public BaseMetaTileEntity() { } @@ -1144,10 +1164,9 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE tItemEntity.hurtResistantTime = 999999; tItemEntity.lifespan = 60000; try { - Field tField = tItemEntity.getClass().getDeclaredField("health"); - tField.setAccessible(true); - tField.setInt(tItemEntity, 99999999); - } catch (Exception e) {e.printStackTrace();} + if(ENTITY_ITEM_HEALTH_FIELD != null) + ENTITY_ITEM_HEALTH_FIELD.setInt(tItemEntity, 99999999); + } catch (Exception ignored) {} this.worldObj.spawnEntityInWorld(tItemEntity); tItem.stackSize = 0; } diff --git a/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java b/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java index bc611e6458..40d917344e 100644 --- a/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java +++ b/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java @@ -338,7 +338,7 @@ public class ModularArmor_Item extends ItemArmor implements ISpecialArmor, IGogg if (stepup > 1) { aPlayer.stepHeight = 1.0f; } - if (GameSettings.isKeyDown(Minecraft.getMinecraft().gameSettings.keyBindJump)) { + if (aWorld.isRemote && GameSettings.isKeyDown(Minecraft.getMinecraft().gameSettings.keyBindJump)) { if (stepup > 0 && jumpticks > 0) { if (data.maxWeight > 2000) { stepup *= 2000.0D / data.maxWeight; |