tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

A few fixes

Browse source
This commit is contained in:
aidancbrady 2015-04-28 08:24:54 -07:00
parent 33ff01b436
commit a32d6f4953
2 changed files with 60 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/mekanism/common/LaserManager.java
View file

@ -58,11 +58,11 @@ public class LaserManager
if(!e.isImmuneToFire()) if(!e.isImmuneToFire())
{ {
e.setFire((int)(energy / 1000)); e.setFire((int)(energy / 1000));
}
if(energy > 256) if(energy > 256)
{ {
e.attackEntityFrom(DamageSource.onFire, (float)energy/1000F); e.attackEntityFrom(DamageSource.generic, (float)energy/1000F);
}
} }
} }

2
src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java
View file

@ -59,6 +59,7 @@ public class ThreadMinerSearch extends Thread
return; return;
} }
try {
if(tileEntity.xCoord == x && tileEntity.yCoord == y && tileEntity.zCoord == z) if(tileEntity.xCoord == x && tileEntity.yCoord == y && tileEntity.zCoord == z)
{ {
continue; continue;
@ -118,6 +119,7 @@ public class ThreadMinerSearch extends Thread
found++; found++;
} }
} }
} catch(Exception e) {}
} }
state = State.FINISHED; state = State.FINISHED;