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

Bug Fixes: Issue #215 + #235 & Minor improvements.

Browse Source 
(BugFix) Officer group buff's will now check ranges
(BugFix) Group buffs applied when a player joins a group as long as they
are within range
(BugFix) /inspire will now take a command string for target
(BugFix) /imagedesign will now take a command string for target
This commit is contained in:
Waverunner
2014-03-27 11:23:15 -04:00
parent c63c602367
commit bb85682bd6
23 changed files with 101 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/BuffService.java
+23 -4
View File
@@ -89,7 +89,7 @@ public class BuffService implements INetworkDispatch {
}
}
public Buff doAddBuff(final CreatureObject target, String buffName, CreatureObject buffer) {
public Buff doAddBuff(final CreatureObject target, String buffName, final CreatureObject buffer) {
if (target.getPosition().getDistance(buffer.getPosition()) > 20) {
return null;
@@ -153,6 +153,23 @@ public class BuffService implements INetworkDispatch {
buff.setRemovalTask(task);
} else if (buff.getGroup2().contains("of_aura") && buffer != null && buffer.getObjectId() != target.getObjectId()) {
// I'm not sure if all aura effects follow the same rules, so this is simply restricted to officer aura's atm
ScheduledFuture<?> task = scheduler.scheduleAtFixedRate(new Runnable() {
@SuppressWarnings("unused")
@Override
public void run() {
if (buffer == null)
removeBuffFromCreature(target, buff);
if (target.getPosition().getDistance2D(buffer.getWorldPosition()) > 80) {
removeBuffFromCreature(target, buff);
}
}
}, 5, 5, TimeUnit.SECONDS);
buff.setRemovalTask(task);
}
for (String effect : buff.getParticleEffect().split(",")) {
@@ -186,7 +203,6 @@ public class BuffService implements INetworkDispatch {
@SuppressWarnings("unused")
public void removeBuffFromCreature(CreatureObject creature, Buff buff) {
if(!creature.getBuffList().contains(buff))
return;
DamageOverTime dot = creature.getDotByBuff(buff);
@@ -201,8 +217,11 @@ public class BuffService implements INetworkDispatch {
for (String effect : buff.getParticleEffect().split(",")) {
creature.stopEffectObject(buff.getBuffName());
}
if (buff.getRemovalTask() != null) {
buff.getRemovalTask().cancel(true);
buff.setRemovalTask(null);
}
}
public void clearBuffs(final CreatureObject creature) {