aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-09-10 22:37:57 +0200
committerTechnus <daniel112092@gmail.com>2017-09-10 22:37:57 +0200
commit3c865dc935d0a2e3725bc4d38c6017ed41087c8b (patch)
tree23cb15b539ef3305c0e6dff4cd9a3309fef837f5 /src/main
parent17ce3e71a322ac5f7998378763bc313be69f0106 (diff)
downloadGT5-Unofficial-3c865dc935d0a2e3725bc4d38c6017ed41087c8b.tar.gz
GT5-Unofficial-3c865dc935d0a2e3725bc4d38c6017ed41087c8b.tar.bz2
GT5-Unofficial-3c865dc935d0a2e3725bc4d38c6017ed41087c8b.zip
fix things
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
index e845f9d814..74db6b70e3 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
@@ -14,7 +14,6 @@ import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.InventoryPlayer;
@@ -192,7 +191,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock
Math.min(powerSetting >> 6,8)+
Math.min(powerSetting >> 8,24)+
Math.min(powerSetting >> 12,48)+
- powerSetting >> 18;
+ (powerSetting >> 18);
boolean inside=true;
do {
@@ -213,7 +212,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock
((EntityItem) entity).setDead();
} else if (entity instanceof EntityLivingBase) {
if(!GT_Utility.isWearingFullElectroHazmat((EntityLivingBase) entity))
- ((EntityLiving) entity).attackEntityFrom(microwaving, damagingFactor);
+ ((EntityLivingBase) entity).attackEntityFrom(microwaving, damagingFactor);
}
}
}