projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-12 22:45:31 -04:00
Code Issues Projects Releases Wiki Activity

refactored slightly.. wasted a lot of time with that. :p

Browse Source
This commit is contained in:
darkk1138
2013-12-09 17:19:53 +01:00
parent a5b31ac5a5
commit 471fab10d8
4 changed files with 78 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+58 -54
View File
@@ -343,7 +343,51 @@ public class CreatureObject extends TangibleObject implements IPersistent {
}
}
public void startPerformance() {
getClient().getSession().write(messageBuilder.buildStartPerformance(true));
}
public void stopPerformance() {
String type = "";
synchronized(objectMutex) {
setPerformanceId(0);
setPerformanceCounter(0);
setCurrentAnimation("");
type = (performanceType) ? "dance" : "music";
}
sendSystemMessage("@performance:" + type + "_stop_self",(byte)0);
stopAudience();
getClient().getSession().write(messageBuilder.buildStartPerformance(false));
}
public void stopAudience() {
String type = "";
synchronized(objectMutex) {
type = (performanceType) ? "dance" : "music";
Iterator<CreatureObject> it = audience.iterator();
while (it.hasNext()) {
CreatureObject next = it.next();
if ((performanceType) && (next.getPerformanceWatchee() != this)) { continue; }
if ((!performanceType) && (next.getPerformanceListenee() != this)) { continue; }
if (performanceType) { next.setPerformanceWatchee(null); }
if (!performanceType) { next.setPerformanceListenee(null); }
//this may be a bit dodgy.
boolean isEntertained = next.getPerformanceListenee() != null && next.getPerformanceWatchee() != null;
if (!isEntertained) {
next.setMoodAnimation("");
}
if (next == this) { continue; }
next.sendSystemMessage("@performance:" + type + "_stop_other",(byte)0);
}
//not sure if this behaviour is correct. might need fixing later.
audience = Collections.synchronizedList(new ArrayList<CreatureObject>());
}
}
@Override
public void setFaction(String faction) {
synchronized(objectMutex) {
@@ -918,6 +962,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
synchronized(objectMutex) {
this.performanceCounter = performanceCounter;
}
getClient().getSession().write(messageBuilder.buildPerformanceCounter(performanceCounter));
}
public int getPerformanceId() {
@@ -930,6 +975,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
synchronized(objectMutex) {
this.performanceId = performanceId;
}
getClient().getSession().write(messageBuilder.buildPerformanceId(performanceId));
}
public boolean getAcceptBandflourishes() {
@@ -1424,61 +1470,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
getClient().getSession().write(messageBuilder.buildListenToId(this.listenToId));
}
public void startPerformance(int performanceId, int performanceCounter, String skillName, boolean isDance) {
synchronized(objectMutex) {
this.performanceId = performanceId;
this.performanceCounter = performanceCounter;
this.currentAnimation = skillName;
this.performanceType = isDance;
}
getClient().getSession().write(messageBuilder.buildPerformanceId(performanceId));
getClient().getSession().write(messageBuilder.buildPerformanceCounter(performanceCounter));
getClient().getSession().write(messageBuilder.buildCurrentAnimationDelta(skillName));
getClient().getSession().write(messageBuilder.buildStartPerformance(true));
}
public void stopPerformance() {
String type = "";
synchronized(objectMutex) {
this.performanceId = 0;
this.performanceCounter = 0;
this.currentAnimation = null;
type = (performanceType) ? "dance" : "music";
}
sendSystemMessage("@performance:" + type + "_stop_self",(byte)0);
stopAudience();
getClient().getSession().write(messageBuilder.buildPerformanceId(performanceId));
getClient().getSession().write(messageBuilder.buildPerformanceCounter(performanceCounter));
getClient().getSession().write(messageBuilder.buildStartPerformance(false));
}
public void stopAudience() {
String type = "";
synchronized(objectMutex) {
type = (performanceType) ? "dance" : "music";
Iterator<CreatureObject> it = audience.iterator();
while (it.hasNext()) {
CreatureObject next = it.next();
if ((performanceType) && (next.getPerformanceWatchee() != this)) { continue; }
if ((!performanceType) && (next.getPerformanceListenee() != this)) { continue; }
if (performanceType) { next.setPerformanceWatchee(null); }
if (!performanceType) { next.setPerformanceListenee(null); }
//this may be a bit dodgy.
boolean isEntertained = next.getPerformanceListenee() != null && next.getPerformanceWatchee() != null;
if (!isEntertained) {
next.setMoodAnimation("");
}
if (next == this) { continue; }
next.sendSystemMessage("@performance:" + type + "_stop_other",(byte)0);
}
//not sure if this behaviour is correct. might need fixing later.
audience = Collections.synchronizedList(new ArrayList<CreatureObject>());
}
}
@Override
public void setPvPBitmask(int pvpBitmask) {
@@ -1505,5 +1497,17 @@ public class CreatureObject extends TangibleObject implements IPersistent {
notifyObservers(messageBuilder.buildDifficultyDelta(difficulty), true);
}
public void setPerformanceType(boolean isDance) {
synchronized(objectMutex) {
this.performanceType = isDance;
}
}
public boolean getPerformanceType() {
synchronized(objectMutex) {
return this.performanceType;
}
}
}