projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-21 11:03:13 -04:00
Code Issues Projects Releases Wiki Activity

Refactored buffs slightly

Browse Source
This commit is contained in:
Mads Boddum
2016-10-25 10:20:29 +02:00
parent a759933504
commit 4bd8aa8fdc
6 changed files with 166 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+10 -7
View File
@@ -30,9 +30,11 @@ package resources.objects.creature;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.Predicate;
import java.util.stream.Stream;
import network.packets.swg.zone.UpdatePostureMessage;
import network.packets.swg.zone.UpdatePvpStatusMessage;
@@ -100,6 +102,7 @@ public class CreatureObject extends TangibleObject {
removeEquipment(obj);
}
@Override
protected void handleSlotReplacement(SWGObject oldParent, SWGObject obj, int arrangement) {
SWGObject inventory = getSlottedObject("inventory");
for (String slot : obj.getArrangement().get(arrangement-4)) {
@@ -590,7 +593,7 @@ public class CreatureObject extends TangibleObject {
}
public void addBuff(CRC buffCrc, Buff buff) {
creo6.addBuff(buffCrc, buff, this);
creo6.putBuff(buffCrc, buff, this);
}
public Buff removeBuff(CRC buffCrc) {
@@ -598,11 +601,11 @@ public class CreatureObject extends TangibleObject {
}
public boolean hasBuff(String buffName) {
return getBuffByCrc(new CRC(buffName.toLowerCase(Locale.ENGLISH))) != null;
return getBuffEntries(buffEntry -> new CRC(buffName.toLowerCase(Locale.ENGLISH)).equals(buffEntry.getKey())).count() > 0;
}
public Buff getBuffByCrc(CRC buffCrc) {
return creo6.getBuffByCrc(buffCrc);
public Stream<Map.Entry<CRC, Buff>> getBuffEntries(Predicate<Map.Entry<CRC, Buff>> predicate) {
return creo6.getBuffEntries(predicate);
}
public void adjustBuffStackCount(CRC buffCrc, int adjustment) {
@@ -613,8 +616,8 @@ public class CreatureObject extends TangibleObject {
creo6.setBuffDuration(buffCrc, playTime, duration, this);
}
public Map<CRC, Buff> getBuffs() {
return new HashMap<>(creo6.getBuffs());
public void forEachBuff(BiConsumer<CRC, Buff> action) {
creo6.forEachBuff(action);
}
public boolean isVisible() {