Merge branch 'experimental'

Conflicts:
	src/resources/objects/waypoint/WaypointObject.java
This commit is contained in:
Obique
2014-08-16 00:59:18 -05:00
2 changed files with 11 additions and 12 deletions
+1 -1
View File
@@ -526,7 +526,7 @@ public class PlayerService implements INetworkDispatch {
});
swgOpcodes.put(Opcodes.CmdSceneReady, (session, data) -> {
session.setAttribute("CmdSceneReady", true);
});
/*swgOpcodes.put(Opcodes.ExpertiseRequestMessage, new INetworkRemoteEvent() {