Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5 from Blood-Asp/unstable

Browse source 
Update
This commit is contained in:
John 2017-01-19 20:59:33 +05:00 committed by GitHub
commit cb4111d405
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
View file

@ -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;
}

2
src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
View file

@ -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;