Update TileMarker.java

Fix NPE on destroying tilemarker.
This commit is contained in:
Sergey 2013-04-21 17:46:57 +08:00
parent 4c23a494aa
commit 0af1d07e39

View file

@ -365,7 +365,7 @@ public class TileMarker extends TileBuildCraft implements IAreaProvider {
} }
} }
if (markerOrigin != this) { if (markerOrigin != this && markerOrigin != null) {
markerOrigin.origin = new Origin(); markerOrigin.origin = new Origin();
} }
@ -376,9 +376,10 @@ public class TileMarker extends TileBuildCraft implements IAreaProvider {
mark.updateSignals(); mark.updateSignals();
} }
} }
if (markerOrigin != null) {
markerOrigin.updateSignals(); markerOrigin.updateSignals();
} }
}
if (signals != null) { if (signals != null) {
for (EntityBlock block : signals) { for (EntityBlock block : signals) {