Fixing conflict resolutions derps.
This commit is contained in:
parent
e984ac27a0
commit
59ee83677b
2 changed files with 0 additions and 4 deletions
|
@ -184,8 +184,5 @@ public class EntityLaser extends Entity implements ISpawnHandler {
|
|||
}
|
||||
|
||||
@Override
|
||||
protected void writeEntityToNBT(NBTTagCompound nbttagcompound) {
|
||||
}
|
||||
|
||||
protected void writeEntityToNBT(NBTTagCompound nbttagcompound) {}
|
||||
}
|
||||
|
|
|
@ -227,7 +227,6 @@ public class EntityRobot extends Entity implements ISpawnHandler {
|
|||
// Defensive code against errors in implementers
|
||||
t.printStackTrace();
|
||||
ModLoader.getLogger().throwing("EntityRobot", "update", t);
|
||||
"update", t);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue