MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

DispatchManager is now an official manager singleton.

Browse Source
This commit is contained in:
MagicBot
2024-05-12 13:14:42 -04:00
parent ff17cacda7
commit 96ba17f67a
160 changed files with 642 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/powers/EffectsBase.java
+6 -6
View File
@@ -10,6 +10,7 @@
package engine.powers;
import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager;
import engine.gameManager.PowersManager;
import engine.job.JobContainer;
import engine.jobs.AbstractEffectJob;
@@ -21,7 +22,6 @@ import engine.mbEnums.EffectSourceType;
import engine.mbEnums.GameObjectType;
import engine.mbEnums.PowerFailCondition;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.ApplyEffectMsg;
import engine.objects.AbstractCharacter;
@@ -441,7 +441,7 @@ public class EffectsBase {
// pum.setDuration((pb.isChant()) ? (int)pb.getChantDuration() : ab.getDurationInSeconds(trains));
pum.setPowerUsedID(pb.getToken());
pum.setPowerUsedName(pb.getName());
DispatchMessage.sendToAllInRange(awo, pum);
DispatchManager.sendToAllInRange(awo, pum);
}
if (awo.getObjectType().equals(GameObjectType.Item)) {
@@ -497,7 +497,7 @@ public class EffectsBase {
pum.setDuration(-1);
pum.setPowerUsedID(pb.getToken());
pum.setPowerUsedName(pb.getName());
DispatchMessage.sendToAllInRange(awo, pum);
DispatchManager.sendToAllInRange(awo, pum);
}
}
@@ -528,7 +528,7 @@ public class EffectsBase {
if (source.getObjectType() == GameObjectType.PlayerCharacter) {
Dispatch dispatch = Dispatch.borrow((PlayerCharacter) source, pum);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
}
}
}
@@ -582,7 +582,7 @@ public class EffectsBase {
pum.setPowerUsedName(pb.getName());
Dispatch dispatch = Dispatch.borrow(conn.getPlayerCharacter(), pum);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
}
}
@@ -634,7 +634,7 @@ public class EffectsBase {
pum.setPowerUsedName(this.name);
Dispatch dispatch = Dispatch.borrow(conn.getPlayerCharacter(), pum);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
}
}
src/engine/powers/effectmodifiers/HealthEffectModifier.java
+4 -4
View File
@@ -9,6 +9,7 @@
package engine.powers.effectmodifiers;
import engine.gameManager.DispatchManager;
import engine.jobs.AbstractEffectJob;
import engine.jobs.DamageOverTimeJob;
import engine.mbEnums;
@@ -16,7 +17,6 @@ import engine.mbEnums.GameObjectType;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.net.AbstractNetMsg;
import engine.net.DispatchMessage;
import engine.net.client.msg.ModifyHealthKillMsg;
import engine.net.client.msg.ModifyHealthMsg;
import engine.objects.*;
@@ -196,7 +196,7 @@ public class HealthEffectModifier extends AbstractEffectModifier {
if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) >= trains) {
ModifyHealthMsg mhm = new ModifyHealthMsg(source, ac, 0f, 0f, 0f, powerID, powerName, trains, effectID);
mhm.setUnknown03(5); //set target is immune
DispatchMessage.sendToAllInRange(ac, mhm);
DispatchManager.sendToAllInRange(ac, mhm);
return;
}
}
@@ -224,7 +224,7 @@ public class HealthEffectModifier extends AbstractEffectModifier {
//send the damage
DispatchMessage.sendToAllInRange(ac, mhm);
DispatchManager.sendToAllInRange(ac, mhm);
// //send corpse if this kills a mob
// //TODO fix the someone misses blurb.
@@ -264,7 +264,7 @@ public class HealthEffectModifier extends AbstractEffectModifier {
//send the damage
DispatchMessage.sendToAllInRange(b, mhm);
DispatchManager.sendToAllInRange(b, mhm);
}
}
src/engine/powers/effectmodifiers/ManaEffectModifier.java
+3 -3
View File
@@ -9,12 +9,12 @@
package engine.powers.effectmodifiers;
import engine.gameManager.DispatchManager;
import engine.jobs.AbstractEffectJob;
import engine.jobs.DamageOverTimeJob;
import engine.mbEnums;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.net.DispatchMessage;
import engine.net.client.msg.ModifyHealthMsg;
import engine.objects.*;
import engine.powers.ActionsBase;
@@ -145,7 +145,7 @@ public class ManaEffectModifier extends AbstractEffectModifier {
if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) >= trains) {
ModifyHealthMsg mhm = new ModifyHealthMsg(source, ac, 0f, 0f, 0f, powerID, powerName, trains, effectID);
mhm.setUnknown03(5); //set target is immune
DispatchMessage.sendToAllInRange(ac, mhm);
DispatchManager.sendToAllInRange(ac, mhm);
return;
}
}
@@ -156,7 +156,7 @@ public class ManaEffectModifier extends AbstractEffectModifier {
effectID);
if (effect instanceof DamageOverTimeJob)
mhm.setOmitFromChat(1);
DispatchMessage.sendToAllInRange(ac, mhm);
DispatchManager.sendToAllInRange(ac, mhm);
}
}
src/engine/powers/effectmodifiers/StaminaEffectModifier.java
+5 -5
View File
@@ -9,12 +9,12 @@
package engine.powers.effectmodifiers;
import engine.gameManager.DispatchManager;
import engine.jobs.AbstractEffectJob;
import engine.jobs.DamageOverTimeJob;
import engine.mbEnums;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.jobs.AbstractEffectJob;
import engine.jobs.DamageOverTimeJob;
import engine.net.DispatchMessage;
import engine.net.client.msg.ModifyHealthMsg;
import engine.objects.*;
import engine.powers.ActionsBase;
@@ -143,7 +143,7 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
if (!skipImmune && bonus.getFloat(ModType.BlackMantle, SourceType.Heal) >= trains) {
ModifyHealthMsg mhm = new ModifyHealthMsg(source, ac, 0f, 0f, 0f, powerID, powerName, trains, effectID);
mhm.setUnknown03(5); //set target is immune
DispatchMessage.sendToAllInRange(ac, mhm);
DispatchManager.sendToAllInRange(ac, mhm);
return;
}
@@ -155,7 +155,7 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
effectID);
if (effect instanceof DamageOverTimeJob)
mhm.setOmitFromChat(1);
DispatchMessage.sendToAllInRange(ac, mhm);
DispatchManager.sendToAllInRange(ac, mhm);
}
}
src/engine/powers/poweractions/ApplyEffectPowerAction.java
+3 -3
View File
@@ -11,6 +11,7 @@ package engine.powers.poweractions;
import engine.InterestManagement.WorldGrid;
import engine.gameManager.ChatManager;
import engine.gameManager.DispatchManager;
import engine.jobs.ChantJob;
import engine.jobs.DeferredPowerJob;
import engine.jobs.FinishEffectTimeJob;
@@ -18,7 +19,6 @@ import engine.math.Vector3fImmutable;
import engine.mbEnums.GameObjectType;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.net.DispatchMessage;
import engine.net.client.msg.chat.ChatSystemMsg;
import engine.objects.*;
import engine.powers.ActionsBase;
@@ -117,7 +117,7 @@ public class ApplyEffectPowerAction extends AbstractPowerAction {
if (awo != null && awo.getObjectType() == GameObjectType.Mob) {
ChatSystemMsg msg = ChatManager.CombatInfo(source, awo);
DispatchMessage.sendToAllInRange(source, msg);
DispatchManager.sendToAllInRange(source, msg);
}
}
if (awo != null && awo.getObjectType() == GameObjectType.Mob) {
@@ -249,7 +249,7 @@ public class ApplyEffectPowerAction extends AbstractPowerAction {
if (awo != null && awo.getObjectType() == GameObjectType.Mob) {
((Mob) awo).setCombatTarget(source);
ChatSystemMsg msg = ChatManager.CombatInfo(source, awo);
DispatchMessage.sendToAllInRange(source, msg);
DispatchManager.sendToAllInRange(source, msg);
}
}
this.effect.startEffect(source, awo, trains, eff);
src/engine/powers/poweractions/CreateMobPowerAction.java
+2 -2
View File
@@ -11,12 +11,12 @@ package engine.powers.poweractions;
import engine.InterestManagement.WorldGrid;
import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager;
import engine.gameManager.NPCManager;
import engine.gameManager.ZoneManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.PetMsg;
import engine.objects.*;
@@ -142,7 +142,7 @@ public class CreateMobPowerAction extends AbstractPowerAction {
pet.setHealth(pet.healthMax);
PetMsg pm = new PetMsg(5, pet);
Dispatch dispatch = Dispatch.borrow(owner, pm);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
@Override
src/engine/powers/poweractions/PeekPowerAction.java
+2 -2
View File
@@ -10,10 +10,10 @@
package engine.powers.poweractions;
import engine.gameManager.ChatManager;
import engine.gameManager.DispatchManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.msg.LootWindowResponseMsg;
import engine.objects.*;
import engine.powers.ActionsBase;
@@ -120,7 +120,7 @@ public class PeekPowerAction extends AbstractPowerAction {
return;
Dispatch dispatch = Dispatch.borrow(pc, lwrm);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
@Override
src/engine/powers/poweractions/RecallPowerAction.java
+2 -2
View File
@@ -10,12 +10,12 @@
package engine.powers.poweractions;
import engine.InterestManagement.WorldGrid;
import engine.gameManager.DispatchManager;
import engine.gameManager.MovementManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.GameObjectType;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.PromptRecallMsg;
import engine.objects.AbstractCharacter;
@@ -56,7 +56,7 @@ public class RecallPowerAction extends AbstractPowerAction {
pc.setTimeStamp("LastRecallType", 1); //recall to bind
PromptRecallMsg promptRecallMsgmsg = new PromptRecallMsg();
Dispatch dispatch = Dispatch.borrow(pc, promptRecallMsgmsg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
} else {
MovementManager.translocate(awoac, awoac.getBindLoc());
src/engine/powers/poweractions/RunegateTeleportPowerAction.java
+2 -2
View File
@@ -12,7 +12,7 @@ package engine.powers.poweractions;
import engine.mbEnums;
import engine.math.Vector3fImmutable;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.gameManager.DispatchManager;
import engine.net.client.msg.PromptRecallMsg;
import engine.objects.*;
import engine.powers.ActionsBase;
@@ -63,7 +63,7 @@ public class RunegateTeleportPowerAction extends AbstractPowerAction {
if (rg != null) {
PromptRecallMsg promptRecallMsgmsg = new PromptRecallMsg();
Dispatch dispatch = Dispatch.borrow(pc, promptRecallMsgmsg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
} else {
src/engine/powers/poweractions/StealPowerAction.java
+4 -4
View File
@@ -9,13 +9,13 @@
package engine.powers.poweractions;
import engine.mbEnums;
import engine.mbEnums.ItemType;
import engine.gameManager.ChatManager;
import engine.gameManager.CombatManager;
import engine.gameManager.DispatchManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.ItemType;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.LootMsg;
import engine.objects.*;
@@ -172,7 +172,7 @@ public class StealPowerAction extends AbstractPowerAction {
//send loot message to person stealing.
LootMsg lm = new LootMsg(source.getObjectType().ordinal(), source.getObjectUUID(), owner.getObjectType().ordinal(), owner.getObjectUUID(), tar);
Dispatch dispatch = Dispatch.borrow(sourcePlayer, lm);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
//update thief's inventory
if (sourcePlayer.charItemManager != null)
src/engine/powers/poweractions/SummonPowerAction.java
+3 -3
View File
@@ -9,12 +9,12 @@
package engine.powers.poweractions;
import engine.mbEnums;
import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager;
import engine.gameManager.ZoneManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.RecvSummonsMsg;
import engine.objects.AbstractCharacter;
@@ -61,7 +61,7 @@ public class SummonPowerAction extends AbstractPowerAction {
location, false);
Dispatch dispatch = Dispatch.borrow(target, rsrm);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
src/engine/powers/poweractions/TransferStatPowerAction.java
+5 -5
View File
@@ -9,12 +9,12 @@
package engine.powers.poweractions;
import engine.gameManager.DispatchManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.math.Vector3fImmutable;
import engine.net.AbstractNetMsg;
import engine.net.DispatchMessage;
import engine.net.client.msg.ModifyHealthKillMsg;
import engine.net.client.msg.ModifyHealthMsg;
import engine.objects.*;
@@ -239,7 +239,7 @@ public class TransferStatPowerAction extends AbstractPowerAction {
if (from.getBonuses().getBool(ModType.ImmuneTo, SourceType.Drain)) {
ModifyHealthMsg mhm = new ModifyHealthMsg(source, to, 0f, 0f, 0f, powerID, powerName, trains, effectID);
mhm.setUnknown03(5); //set target is immune
DispatchMessage.sendToAllInRange(from, mhm);
DispatchManager.sendToAllInRange(from, mhm);
return;
}
@@ -271,8 +271,8 @@ public class TransferStatPowerAction extends AbstractPowerAction {
mhmFrom = new ModifyHealthMsg(source, from, 0f, 0f, -fromAmount, powerID, powerName, trains, effectID);
}
DispatchMessage.sendToAllInRange(to, mhmTo);
DispatchMessage.sendToAllInRange(from, mhmFrom);
DispatchManager.sendToAllInRange(to, mhmTo);
DispatchManager.sendToAllInRange(from, mhmFrom);
}
}