Made quarry not crash instantly. Still a horrible, horrible mess.
This commit is contained in:
parent
1a5ad78290
commit
6770392784
2 changed files with 17 additions and 1 deletions
|
@ -87,6 +87,10 @@ public class EntityRobot extends Entity implements IEntityAdditionalSpawnData {
|
|||
|
||||
@Override
|
||||
public void writeSpawnData(ByteArrayDataOutput data) {
|
||||
|
||||
if(box == null)
|
||||
box = new Box();
|
||||
|
||||
data.writeInt(box.xMin);
|
||||
data.writeInt(box.yMin);
|
||||
data.writeInt(box.zMin);
|
||||
|
@ -244,7 +248,10 @@ public class EntityRobot extends Entity implements IEntityAdditionalSpawnData {
|
|||
}
|
||||
|
||||
private void updateLaser() {
|
||||
|
||||
|
||||
if(laser == null)
|
||||
return;
|
||||
|
||||
if (targets.size() > 0) {
|
||||
|
||||
Action a = targets.getFirst();
|
||||
|
|
|
@ -19,11 +19,16 @@ import cpw.mods.fml.common.Mod.PostInit;
|
|||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||
import cpw.mods.fml.common.network.NetworkMod;
|
||||
import cpw.mods.fml.common.registry.EntityRegistry;
|
||||
|
||||
import buildcraft.BuildCraftCore;
|
||||
import buildcraft.core.ClassMapping;
|
||||
import buildcraft.core.DefaultProps;
|
||||
import buildcraft.core.EntityEnergyLaser;
|
||||
import buildcraft.core.EntityLaser;
|
||||
import buildcraft.core.EntityRobot;
|
||||
import buildcraft.core.ProxyCore;
|
||||
import buildcraft.core.network.EntityIds;
|
||||
import buildcraft.core.network.PacketHandler;
|
||||
import buildcraft.core.utils.Localization;
|
||||
|
||||
|
@ -57,6 +62,10 @@ public class mod_BuildCraftCore {
|
|||
|
||||
if (!initialized) {
|
||||
|
||||
EntityRegistry.registerModEntity(EntityRobot.class, "bcRobot", EntityIds.ROBOT, instance, 50, 1, true);
|
||||
EntityRegistry.registerModEntity(EntityLaser.class, "bcLaser", EntityIds.LASER, instance, 50, 1, true);
|
||||
EntityRegistry.registerModEntity(EntityEnergyLaser.class, "bcEnergyLaser", EntityIds.ENERGY_LASER, instance, 50, 1, true);
|
||||
|
||||
// Init rendering if applicable
|
||||
ProxyCore.proxy.initializeRendering();
|
||||
ProxyCore.proxy.initializeEntityRendering();
|
||||
|
|
Loading…
Reference in a new issue