projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-15 05:13:14 -04:00
Code Issues Projects Releases Wiki Activity

master merge

Browse Source
This commit is contained in:
CharonInferar
2014-07-14 15:32:28 +02:00
parent becca491b4
commit cc28f80394
80 changed files with 1132 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SimulationService.java
+2 -2
View File
@@ -550,8 +550,8 @@ public class SimulationService implements INetworkDispatch {
object.getContainer()._remove(object);
if (object.getClient() == null)
System.err.println("Client is null! This is a very strange error.");
if (object.getClient() != null && object.getClient().isGM() && parent != null && parent instanceof CellObject && parent.getContainer() != null)
object.sendSystemMessage("BuildingId - Dec: " + parent.getContainer().getObjectID() + " Hex: " + Long.toHexString(parent.getContainer().getObjectID()) + " CellNumber: " + ((CellObject) parent).getCellNumber(), DisplayType.Broadcast);
//if (object.getClient() != null && object.getClient().isGM() && parent != null && parent instanceof CellObject && parent.getContainer() != null)
//object.sendSystemMessage("BuildingId - Dec: " + parent.getContainer().getObjectID() + " Hex: " + Long.toHexString(parent.getContainer().getObjectID()) + " CellNumber: " + ((CellObject) parent).getCellNumber(), DisplayType.Broadcast);
parent._add(object);
}
object.setPosition(newPos);