mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-18 11:29:30 +00:00
Fixed crashed when tinkers construct installed caused by Killer Joe firing a player event.
This commit is contained in:
1 parent
6cb0b6e011
commit
06dc680c1f
4 files changed
+10
-18
No files matched your search
@@ -31,6 +31,7 @@ import crazypants.enderio.config.Config;
|
||||
import crazypants.enderio.machine.AbstractMachineEntity;
|
||||
import crazypants.enderio.machine.SlotDefinition;
|
||||
import crazypants.enderio.machine.generator.zombie.NutrientTank;
|
||||
import crazypants.enderio.machine.wireless.WirelessChargerController;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
import crazypants.enderio.xp.ExperienceContainer;
|
||||
import crazypants.enderio.xp.IHaveExperience;
|
||||
@@ -429,10 +430,6 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle
|
||||
} else {
|
||||
fuelTank.setFluid(null);
|
||||
}
|
||||
|
||||
// experienceLevel = nbtRoot.getInteger("experienceLevel");
|
||||
// experienceTotal = nbtRoot.getInteger("experienceTotal");
|
||||
// experience = nbtRoot.getFloat("experience");
|
||||
xpCon.readFromNBT(nbtRoot);
|
||||
}
|
||||
|
||||
@@ -444,12 +441,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle
|
||||
fuelTank.writeToNBT(tankRoot);
|
||||
nbtRoot.setTag("fuelTank", tankRoot);
|
||||
}
|
||||
|
||||
// nbtRoot.setInteger("experienceLevel", experienceLevel);
|
||||
// nbtRoot.setInteger("experienceTotal", experienceTotal);
|
||||
// nbtRoot.setFloat("experience", experience);
|
||||
xpCon.writeToNBT(nbtRoot);
|
||||
|
||||
}
|
||||
|
||||
private class Attackera extends FakePlayer {
|
||||
@@ -478,7 +470,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle
|
||||
}
|
||||
prevWeapon = cur == null ? null : cur.copy();
|
||||
}
|
||||
FMLCommonHandler.instance().bus().post(new PlayerTickEvent(Phase.END, this));
|
||||
WirelessChargerController.instance.chargePlayersItems(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -55,7 +55,6 @@ public class PacketStoredEnergy implements IMessage, IMessageHandler<PacketStore
|
||||
(me.storedEnergyRF > 0 && message.storedEnergy <= 0);
|
||||
me.storedEnergyRF = message.storedEnergy;
|
||||
if(doRender) {
|
||||
System.out.println("PacketStoredEnergy.onMessage: ");
|
||||
player.worldObj.markBlockRangeForRenderUpdate(message.x, message.y, message.z, message.x, message.y, message.z);
|
||||
}
|
||||
|
||||
|
||||
@@ -59,14 +59,18 @@ public class WirelessChargerController {
|
||||
if(event.side == Side.CLIENT || event.phase != TickEvent.Phase.END) {
|
||||
return;
|
||||
}
|
||||
Map<BlockCoord, IWirelessCharger> chargers = getChargersForWorld(event.player.worldObj);
|
||||
chargePlayersItems(event.player);
|
||||
}
|
||||
|
||||
public void chargePlayersItems(EntityPlayer player) {
|
||||
Map<BlockCoord, IWirelessCharger> chargers = getChargersForWorld(player.worldObj);
|
||||
if(chargers.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
BlockCoord bc = new BlockCoord((int) event.player.posX, (int) event.player.posY, (int) event.player.posZ);
|
||||
BlockCoord bc = new BlockCoord((int) player.posX, (int) player.posY, (int) player.posZ);
|
||||
for (IWirelessCharger capBank : chargers.values()) {
|
||||
if(capBank.getLocation().distanceSquared(bc) <= RANGE_SQ) {
|
||||
boolean done = chargeFromCapBank(event.player, capBank);
|
||||
boolean done = chargeFromCapBank(player, capBank);
|
||||
if(done) {
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user