Merge pull request #767 from Prototik/master

Fix for destroying a tilemarker.
This commit is contained in:
Krapht 2013-04-21 02:50:44 -07:00
commit 52177fd330

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();
}
@ -376,8 +376,9 @@ public class TileMarker extends TileBuildCraft implements IAreaProvider {
mark.updateSignals();
}
}
markerOrigin.updateSignals();
if (markerOrigin != null) {
markerOrigin.updateSignals();
}
}
if (signals != null) {