projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-31 01:15:57 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
Conflicts:
	src/services/SimulationService.java
This commit is contained in:
Light2
2013-12-08 18:21:50 +01:00
parent 93195f7d5f 4e78f9064e
commit f2200711cf
117 changed files with 2388 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SimulationService.java
+2 -29
View File
@@ -589,36 +589,9 @@ public class SimulationService implements INetworkDispatch {
add(object, pos.x, pos.z, true);
}
PlayerObject ghost = (PlayerObject) object.getSlottedObject("ghost");
if (ghost != null) {
String objectShortName = object.getCustomName().toLowerCase();
if (object.getCustomName().contains(" ")) {
String[] splitName = object.getCustomName().toLowerCase().split(" ");
objectShortName = splitName[0].toLowerCase();
}
core.chatService.playerStatusChange(objectShortName, (byte) 1);
if (ghost.getFriendList().isEmpty() == false) {
// Find out what friends are online/offline
for (String friend : ghost.getFriendList()) {
SWGObject friendObject = (SWGObject) core.chatService.getObjectByFirstName(friend);
if (friendObject == null)
continue;
if(friendObject.isInQuadtree() == true) {
ChatFriendsListUpdate onlineNotifyStatus = new ChatFriendsListUpdate(friend, (byte) 1);
client.getSession().write(onlineNotifyStatus.serialize());
} else {
ChatOnChangeFriendStatus changeStatus = new ChatOnChangeFriendStatus(object.getObjectID(), friend, 0);
client.getSession().write(changeStatus.serialize());
}
}
}
}
if(object.getParentId() == 0)
add(object, pos.x, pos.z);
core.weatherService.sendWeather(object);