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

Buffs refactored to use DatatableVisitor on server load

Browse Source 
Originally, everytime a new Buff instance was created, it would loop
through the Datatable Visitor everytime. Now it's only done once on
server startup and put into a buffMap. A copy of the base buff is then
done through the constructor of Buff class should a new instance of that
buff type needs to be created from the one inside the map.
This commit is contained in:
Waverunner
2014-04-06 16:29:31 -04:00
parent b350bad2da
commit 438c960d88
3 changed files with 91 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/BuffService.java
+53 -3
View File
@@ -22,6 +22,7 @@
package services;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
@@ -37,6 +38,9 @@ import resources.objects.creature.CreatureObject;
import resources.objects.group.GroupObject;
import resources.objects.player.PlayerObject;
import main.NGECore;
import engine.clientdata.ClientFileManager;
import engine.clientdata.visitors.DatatableVisitor;
import engine.resources.common.CRC;
import engine.resources.objects.SWGObject;
import engine.resources.service.INetworkDispatch;
import engine.resources.service.INetworkRemoteEvent;
@@ -45,10 +49,13 @@ public class BuffService implements INetworkDispatch {
private NGECore core;
private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
private ConcurrentHashMap<String, Buff> buffMap = new ConcurrentHashMap<String, Buff>();
public BuffService(NGECore core) {
this.core = core;
core.commandService.registerCommand("removeBuff");
loadBuffs();
}
@Override
@@ -80,7 +87,7 @@ public class BuffService implements INetworkDispatch {
return;
}*/
final Buff buff = new Buff(buffName, buffer.getObjectID());
Buff buff = buffMap.get(buffName);
if(buff.isGroupBuff()) {
addGroupBuff(buffer, buffName, buffer);
return true;
@@ -100,7 +107,7 @@ public class BuffService implements INetworkDispatch {
return null;
}
final Buff buff = new Buff(buffName, target.getObjectID());
final Buff buff = new Buff(buffMap.get(buffName), target.getObjectID());
if(target.getSlottedObject("ghost") != null)
buff.setTotalPlayTime(((PlayerObject) target.getSlottedObject("ghost")).getTotalPlayTime());
else
@@ -311,4 +318,47 @@ public class BuffService implements INetworkDispatch {
}
}
private void loadBuffs() {
try {
DatatableVisitor visitor = ClientFileManager.loadFile("datatables/buff/buff.iff", DatatableVisitor.class);
for(int i = 0; i < visitor.getRowCount(); i++) {
Buff buff = new Buff();
String name = (String) visitor.getObject(i, 0);
buff.setBuffName(name);
buff.setBuffCRC(CRC.StringtoCRC(name));
buff.setGroup1((String) visitor.getObject(i, 1));
buff.setGroup2((String) visitor.getObject(i, 2));
buff.setPriority((int) visitor.getObject(i, 4));
buff.setDuration((Float) visitor.getObject(i, 6));
buff.setEffect1Name((String) visitor.getObject(i, 7));
buff.setEffect1Value((Float) visitor.getObject(i, 8));
buff.setEffect2Name((String) visitor.getObject(i, 9));
buff.setEffect2Value((Float) visitor.getObject(i, 10));
buff.setEffect3Name((String) visitor.getObject(i, 11));
buff.setEffect3Value((Float) visitor.getObject(i, 12));
buff.setEffect4Name((String) visitor.getObject(i, 13));
buff.setEffect4Value((Float) visitor.getObject(i, 14));
buff.setEffect5Name((String) visitor.getObject(i, 15));
buff.setEffect5Value((Float) visitor.getObject(i, 16));
buff.setCallback((String) visitor.getObject(i, 18));
buff.setParticleEffect((String) visitor.getObject(i, 19));
buff.setDebuff((Boolean) visitor.getObject(i, 22));
buff.setRemoveOnDeath((Integer) visitor.getObject(i, 25) != 0);
buff.setRemovableByPlayer((Integer) visitor.getObject(i, 26) != 0);
buff.setMaxStacks((Integer) visitor.getObject(i, 28));
buff.setPersistent((Integer) visitor.getObject(i, 29) != 0);
buff.setRemoveOnRespec((Integer) visitor.getObject(i, 31) != 0);
buff.setAiRemoveOnEndCombat((Integer) visitor.getObject(i, 32) != 0);
buff.setDecayOnPvPDeath((Integer) visitor.getObject(i, 33) != 0);
buffMap.put(name, buff);
}
} catch (InstantiationException | IllegalAccessException e) {
e.printStackTrace();
}
}
}