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

Added some medic specials, minor combat fixes

Browse Source
This commit is contained in:
Light2
2013-09-23 18:02:31 +02:00
parent 718880dfcf
commit fbcbc26065
19 changed files with 355 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+9 -20
View File
@@ -29,6 +29,7 @@ import org.apache.mina.core.buffer.IoBuffer;
import protocol.swg.ChatSystemMessage;
import protocol.swg.ObjControllerMessage;
import protocol.swg.PlayClientEffectObjectMessage;
import protocol.swg.UpdatePVPStatusMessage;
import protocol.swg.UpdatePostureMessage;
import protocol.swg.objectControllerObjects.Posture;
@@ -927,27 +928,15 @@ public class CreatureObject extends TangibleObject implements IPersistent {
}
IoBuffer delta;
// IoBuffer delta2;
int counter;
synchronized(objectMutex) {
if(health > maxHealth)
health = maxHealth;
this.health = health;
counter = getHamListCounter() + 1;
setHamListCounter(getHamListCounter() + 1);
delta = messageBuilder.buildUpdateHAMListDelta();
/*if(health == 1)
delta2 = messageBuilder.buildHealthDelta(0);
else
delta2 = delta;*/
delta = messageBuilder.buildHealthDelta(health);
notifyObservers(delta, true);
/*if(getClient() != null)
getClient().getSession().write(delta2);*/
this.health = health;
}
if(counter != getHamListCounter())
System.out.println("test");
}
@@ -959,18 +948,14 @@ public class CreatureObject extends TangibleObject implements IPersistent {
public void setAction(int action) {
IoBuffer delta;
int counter;
synchronized(objectMutex) {
if(action > maxAction)
action = maxAction;
this.action = action;
counter = getHamListCounter() + 1;
setHamListCounter(getHamListCounter() + 1);
delta = messageBuilder.buildUpdateHAMListDelta();
delta = messageBuilder.buildActionDelta(action);
notifyObservers(delta, true);
this.action = action;
}
if(counter != getHamListCounter())
System.out.println("test");
}
public int getHamListCounter() {
@@ -1096,6 +1081,10 @@ public class CreatureObject extends TangibleObject implements IPersistent {
notifyObservers(messageBuilder.buildResetHAMListDelta(), true);
}
}
public void playEffectObject(String effectFile, String commandString) {
notifyObservers(new PlayClientEffectObjectMessage(effectFile, getObjectID(), commandString), true);
}
}