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/protocol/swg/ObjControllerMessage.java
	src/resources/objects/player/PlayerMessageBuilder.java
	src/services/travel/TravelService.java
This commit is contained in:
Light2
2014-03-10 00:42:19 +01:00
parent 807025ec0b 41d8fcf841
commit 52136c2b36
182 changed files with 2439 additions and 10372 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/tangible/TangibleObject.java
+6
View File
@@ -87,6 +87,12 @@ public class TangibleObject extends SWGObject {
super();
messageBuilder = new TangibleMessageBuilder(this);
}
public void setCustomName2(String customName) {
setCustomName(customName);
notifyObservers(messageBuilder.buildCustomNameDelta(customName), true);
}
public int getIncapTimer() {
return incapTimer;