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

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

Browse Source 
Conflicts:
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/services/object/ObjectService.java
This commit is contained in:
Treeku
2013-12-03 17:02:35 +00:00
parent 0edf9610df d0fe165024
commit 9cbbc71e84
251 changed files with 3569 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/PlayerService.java
+4 -4
View File
@@ -170,7 +170,7 @@ public class PlayerService implements INetworkDispatch {
});
swgOpcodes.put(Opcodes.ExpertiseRequestMessage, new INetworkRemoteEvent() {
/*swgOpcodes.put(Opcodes.ExpertiseRequestMessage, new INetworkRemoteEvent() {
@Override
public void handlePacket(IoSession session, IoBuffer buffer) throws Exception {
@@ -199,7 +199,7 @@ public class PlayerService implements INetworkDispatch {
}
});
});*/
}
@@ -321,7 +321,7 @@ public class PlayerService implements INetworkDispatch {
DatatableVisitor experienceTable;
PlayerObject player = (PlayerObject) creature.getSlottedObject("ghost");
synchronized(objectMutex) {
//synchronized(objectMutex) {
try {
experienceTable = ClientFileManager.loadFile("datatables/player/player_level.iff", DatatableVisitor.class);
@@ -487,7 +487,7 @@ public class PlayerService implements INetworkDispatch {
} catch (InstantiationException | IllegalAccessException e) {
e.printStackTrace();
}
}
//}
}
public void addPlayerTitle(PlayerObject player, String title) {