projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-18 08:02:53 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
	src/services/PlayerService.java
This commit is contained in:
Light2
2014-03-25 20:14:16 +01:00
parent 3e265ed6c5 cf51dcc2aa
commit d1a7f20177
434 changed files with 6253 additions and 1485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/player/PlayerObject.java
+5 -3
View File
@@ -233,8 +233,8 @@ public class PlayerObject extends IntangibleObject {
synchronized(objectMutex) {
xpExists = xpList.containsKey(type);
xpList.put(type, amount);
Console.println("Put " + type + " exp of " + amount + " in the map.");
Console.println("Map is now: " + xpList.get(type).intValue());
//Console.println("Put " + type + " exp of " + amount + " in the map.");
//Console.println("Map is now: " + xpList.get(type).intValue());
}
if (getContainer() != null && getContainer().getClient() != null && getContainer().getClient().getSession() != null) {
@@ -687,7 +687,9 @@ public class PlayerObject extends IntangibleObject {
}
public String getSpouseName() {
return spouse;
synchronized(objectMutex) {
return spouse;
}
}
public void setSpouseName(String spouse) {