From dad8760e53b70e2384e7d830e9fcf11d549de748 Mon Sep 17 00:00:00 2001 From: Mads Boddum Date: Mon, 9 May 2016 18:07:29 +0200 Subject: [PATCH] Fixed incorrect getters for base attributes in CreatureObject and added some setters --- .../objects/creature/CreatureObject.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index 980b71630..2f645f8eb 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -719,11 +719,11 @@ public class CreatureObject extends TangibleObject { } public int getMaxAction() { - return attributes.get(2); + return maxAttributes.get(2); } public int getBaseAction() { - return attributes.get(2); + return baseAttributes.get(2); } public void addAbility(String abilityName){ @@ -739,6 +739,13 @@ public class CreatureObject extends TangibleObject { public Set getAbilityNames() { return abilities.keySet(); }; + public void setBaseHealth(int baseHealth) { + synchronized(baseAttributes) { + baseAttributes.set(0, baseHealth); + baseAttributes.sendDeltaMessage(this); + } + } + public void setHealth(int health) { synchronized(attributes) { attributes.set(0, health); @@ -753,6 +760,13 @@ public class CreatureObject extends TangibleObject { } } + public void setBaseAction(int baseAction) { + synchronized(baseAttributes) { + baseAttributes.set(2, baseAction); + baseAttributes.sendDeltaMessage(this); + } + } + public void setAction(int action) { synchronized(attributes) { attributes.set(2, action);