diff options
| author | John <Techlone@users.noreply.github.com> | 2017-01-14 04:05:25 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-14 04:05:25 +0500 |
| commit | c39c6f8beae48e2ed63d70f8223b899b49fef537 (patch) | |
| tree | 7b57bcedd0ef8a506d0f35417a20018fc9ebdf13 /src/main/java/gregtech/common/items/behaviors | |
| parent | 75fc96694a7ce15618e6da1d52cd05f77b77169e (diff) | |
| parent | 5c5aad452228255815deab8ff3bcb85e147ef63b (diff) | |
| download | GT5-Unofficial-c39c6f8beae48e2ed63d70f8223b899b49fef537.tar.gz GT5-Unofficial-c39c6f8beae48e2ed63d70f8223b899b49fef537.tar.bz2 GT5-Unofficial-c39c6f8beae48e2ed63d70f8223b899b49fef537.zip | |
Merge pull request #4 from Blood-Asp/unstable
update
Diffstat (limited to 'src/main/java/gregtech/common/items/behaviors')
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java | 1 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java index d716fde8ab..0b9dcdf3c2 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java @@ -51,6 +51,7 @@ public class Behaviour_Plunger_Fluid GT_MetaTileEntity_BasicTank machine = (GT_MetaTileEntity_BasicTank) mTileEntity;
if(machine.mFluid!=null&&machine.mFluid.amount>0)
machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, 1000);
+ GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(101)), 1.0F, -1.0F, aX, aY, aZ);
return true;
}
}
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java index 8b27fb2c29..451bf982c2 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Sense.java @@ -30,7 +30,7 @@ public class Behaviour_Sense for (int j = -2; j < 3; j++) {
for (int k = -2; k < 3; k++) {
if ((aStack.stackSize > 0) && (((tTileEntity = aWorld.getTileEntity(aX + i, aY + j, aZ + k)) instanceof ICropTile)) && (((ICropTile) tTileEntity).harvest(true)) && (!aPlayer.capabilities.isCreativeMode)) {
- ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts);
+ ((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts/20);
}
}
}
|