aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorAlexdoru <57050655+Alexdoru@users.noreply.github.com>2022-09-09 17:30:08 +0200
committerGitHub <noreply@github.com>2022-09-09 17:30:08 +0200
commitbf95c0306a86e409abe2197cc5507152ecc8a8a1 (patch)
tree5842f0a58edb9b6adca63f1563a2cd88c8e31440 /src/main/java/gregtech/common
parent10627526f2bf3431e3945f8305421dd222616236 (diff)
downloadGT5-Unofficial-bf95c0306a86e409abe2197cc5507152ecc8a8a1.tar.gz
GT5-Unofficial-bf95c0306a86e409abe2197cc5507152ecc8a8a1.tar.bz2
GT5-Unofficial-bf95c0306a86e409abe2197cc5507152ecc8a8a1.zip
Revert "fix chainsaw spawns water when harvests ice (#1358)" (#1365)
This reverts commit bab4770748defcaf093af1cce44656c829d4e78f.
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java14
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Saw.java14
2 files changed, 2 insertions, 26 deletions
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
index 83825c9fee..f0b26eb913 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
@@ -11,7 +11,6 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
-import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@@ -129,19 +128,8 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw {
} else if (((aBlock.getMaterial() == Material.ice) || (aBlock.getMaterial() == Material.packedIce))
&& (aDrops.isEmpty())) {
aDrops.add(new ItemStack(aBlock, 1, aMetaData));
+ aPlayer.worldObj.setBlockToAir(aX, aY, aZ);
aEvent.dropChance = 1.0F;
- EntityCreature iceBreaker = new EntityCreature(aPlayer.worldObj) {
- @Override
- public void onUpdate() {
- aPlayer.worldObj.setBlockToAir(aX, aY, aZ);
- setDead();
- }
- };
- iceBreaker.forceSpawn = true;
- iceBreaker.posX = aX;
- iceBreaker.posY = aY;
- iceBreaker.posZ = aZ;
- aPlayer.worldObj.spawnEntityInWorld(iceBreaker);
return 1;
}
if ((GregTech_API.sTimber)
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Saw.java b/src/main/java/gregtech/common/tools/GT_Tool_Saw.java
index e646d88b34..881ed6f61f 100644
--- a/src/main/java/gregtech/common/tools/GT_Tool_Saw.java
+++ b/src/main/java/gregtech/common/tools/GT_Tool_Saw.java
@@ -8,7 +8,6 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
-import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@@ -101,19 +100,8 @@ public class GT_Tool_Saw extends GT_Tool {
} else if (((aBlock.getMaterial() == Material.ice) || (aBlock.getMaterial() == Material.packedIce))
&& (aDrops.isEmpty())) {
aDrops.add(new ItemStack(aBlock, 1, aMetaData));
+ aPlayer.worldObj.setBlockToAir(aX, aY, aZ);
aEvent.dropChance = 1.0F;
- EntityCreature iceBreaker = new EntityCreature(aPlayer.worldObj) {
- @Override
- public void onUpdate() {
- aPlayer.worldObj.setBlockToAir(aX, aY, aZ);
- setDead();
- }
- };
- iceBreaker.forceSpawn = true;
- iceBreaker.posX = aX;
- iceBreaker.posY = aY;
- iceBreaker.posZ = aZ;
- aPlayer.worldObj.spawnEntityInWorld(iceBreaker);
return 1;
}
return 0;