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

Fixed #126, updated git ignore list

Browse Source
This commit is contained in:
Seefo
2014-03-26 22:02:19 -04:00
parent c31c24d7ec
commit 7970be3656
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+11 -2
View File
@@ -1246,8 +1246,12 @@ public class CreatureObject extends TangibleObject implements IPersistent {
IoBuffer delta;
synchronized(objectMutex) {
if (this.health == health) return;
if(health > maxHealth)
health = maxHealth;
{
setHealth(maxHealth);
return;
}
setHamListCounter(getHamListCounter() + 1);
delta = messageBuilder.buildHealthDelta(health);
@@ -1264,10 +1268,15 @@ public class CreatureObject extends TangibleObject implements IPersistent {
}
public void setAction(int action) {
IoBuffer delta;
synchronized(objectMutex) {
if (this.action == action) return;
if(action > maxAction)
action = maxAction;
{
setAction(maxAction);
return;
}
setHamListCounter(getHamListCounter() + 1);
delta = messageBuilder.buildActionDelta(action);
notifyObservers(delta, true);