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/objects/AbstractCharacter.java
+3 -4
View File
@@ -27,7 +27,6 @@ import engine.mbEnums;
import engine.mbEnums.*;
import engine.net.ByteBufferWriter;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.ApplyRuneMsg;
import engine.net.client.msg.UpdateStateMsg;
@@ -579,7 +578,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
//update client with removed rune.
ApplyRuneMsg arm = new ApplyRuneMsg(playerCharacter.getObjectType().ordinal(), playerCharacter.getObjectUUID(), runeID);
Dispatch dispatch = Dispatch.borrow(playerCharacter, arm);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
}
public static void removeAllBlessings(PlayerCharacter playerCharacter) {
@@ -1677,14 +1676,14 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
this.setCombat(false);
UpdateStateMsg rwss = new UpdateStateMsg();
rwss.setPlayer(this);
DispatchMessage.sendToAllInRange(this, rwss);
DispatchManager.sendToAllInRange(this, rwss);
}
} else {
if (!this.isCombat()) {
this.setCombat(true);
UpdateStateMsg rwss = new UpdateStateMsg();
rwss.setPlayer(this);
DispatchMessage.sendToAllInRange(this, rwss);
DispatchManager.sendToAllInRange(this, rwss);
}
}
}
src/engine/objects/AbstractIntelligenceAgent.java
+2 -2
View File
@@ -10,6 +10,7 @@
package engine.objects;
import engine.InterestManagement.WorldGrid;
import engine.gameManager.DispatchManager;
import engine.gameManager.ZoneManager;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
@@ -18,7 +19,6 @@ import engine.mbEnums.ModType;
import engine.mbEnums.SourceType;
import engine.mobileAI.Threads.MobAIThread;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.msg.PetMsg;
import engine.server.MBServerStatics;
@@ -179,7 +179,7 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter {
PetMsg petMsg = new PetMsg(5, null);
Dispatch dispatch = Dispatch.borrow(owner, petMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
if (pet != null && pet.getObjectUUID() == this.getObjectUUID())
owner.setPet(null);
src/engine/objects/AbstractWorldObject.java
+2 -2
View File
@@ -11,6 +11,7 @@ package engine.objects;
import engine.InterestManagement.Terrain;
import engine.InterestManagement.WorldGrid;
import engine.gameManager.DispatchManager;
import engine.job.AbstractScheduleJob;
import engine.job.JobContainer;
import engine.job.JobScheduler;
@@ -24,7 +25,6 @@ import engine.mbEnums.EffectSourceType;
import engine.mbEnums.GameObjectType;
import engine.mbEnums.GridObjectType;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.UpdateEffectsMsg;
import engine.powers.EffectsBase;
@@ -431,7 +431,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
public void sendAllEffects(ClientConnection cc) {
UpdateEffectsMsg msg = new UpdateEffectsMsg(this);
Dispatch dispatch = Dispatch.borrow((PlayerCharacter) this, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
}
public void applyAllBonuses() {
src/engine/objects/Account.java
+11 -15
View File
@@ -9,15 +9,11 @@
package engine.objects;
import engine.gameManager.ConfigManager;
import engine.gameManager.DbManager;
import engine.gameManager.NPCManager;
import engine.gameManager.SessionManager;
import engine.gameManager.*;
import engine.mbEnums;
import engine.mbEnums.DispatchChannel;
import engine.mbEnums.ItemContainerType;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.handlers.ItemFromVaultMsgHandler;
import engine.net.client.handlers.ItemToVaultMsgHandler;
@@ -228,7 +224,7 @@ public class Account extends AbstractGameObject {
if (player.charItemManager.moveItemToVault(item)) {
this.vault.add(item);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
} else
ItemToVaultMsgHandler.forceTransferFromVaultToInventory(msg, origin, "Failed to transfer item.");
}
@@ -274,7 +270,7 @@ public class Account extends AbstractGameObject {
this.vault.remove(item);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
} else
ItemFromVaultMsgHandler.forceTransferFromInventoryToVault(msg, origin, "Failed to transfer item.");
@@ -319,17 +315,17 @@ public class Account extends AbstractGameObject {
UpdateGoldMsg ugm = new UpdateGoldMsg(player);
ugm.configure();
dispatch = Dispatch.borrow(player, ugm);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
UpdateVaultMsg uvm = new UpdateVaultMsg(account);
dispatch = Dispatch.borrow(player, uvm);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
dispatch = Dispatch.borrow(player, open);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
dispatch = Dispatch.borrow(player, show);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
}
@@ -373,20 +369,20 @@ public class Account extends AbstractGameObject {
UpdateGoldMsg ugm = new UpdateGoldMsg(player);
ugm.configure();
dispatch = Dispatch.borrow(player, ugm);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
UpdateVaultMsg uvm = new UpdateVaultMsg(account);
dispatch = Dispatch.borrow(player, uvm);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
OpenVaultMsg open = new OpenVaultMsg(player, npc);
dispatch = Dispatch.borrow(player, open);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
//
//
ShowVaultInventoryMsg show = new ShowVaultInventoryMsg(player, account, npc); // 37??
dispatch = Dispatch.borrow(player, show);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
}
}
src/engine/objects/Bane.java
+5 -9
View File
@@ -12,10 +12,7 @@ package engine.objects;
import engine.InterestManagement.WorldGrid;
import engine.db.archive.BaneRecord;
import engine.db.archive.DataWarehouse;
import engine.gameManager.BuildingManager;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.gameManager.ZoneManager;
import engine.gameManager.*;
import engine.job.JobScheduler;
import engine.jobs.ActivateBaneJob;
import engine.jobs.BaneDefaultTimeJob;
@@ -24,7 +21,6 @@ import engine.mbEnums;
import engine.mbEnums.ProtectionState;
import engine.mbEnums.SiegePhase;
import engine.mbEnums.SiegeResult;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.PlaceAssetMsg;
import engine.net.client.msg.chat.ChatSystemMsg;
@@ -258,7 +254,7 @@ public final class Bane {
chatMsg.setMessageType(4);
chatMsg.setChannel(mbEnums.ChatChannelType.SYSTEM.getChannelID());
DispatchMessage.dispatchMsgToAll(chatMsg);
DispatchManager.dispatchMsgToAll(chatMsg);
// Push this event to the DataWarehouse
@@ -554,7 +550,7 @@ public final class Bane {
msg.setMessageType(4);
msg.setChannel(mbEnums.ChatChannelType.SYSTEM.getChannelID());
DispatchMessage.dispatchMsgToAll(msg);
DispatchManager.dispatchMsgToAll(msg);
}
@@ -573,7 +569,7 @@ public final class Bane {
msg.setMessageType(4);
msg.setChannel(mbEnums.ChatChannelType.SYSTEM.getChannelID());
DispatchMessage.dispatchMsgToAll(msg);
DispatchManager.dispatchMsgToAll(msg);
}
break;
case DESTROY:
@@ -590,7 +586,7 @@ public final class Bane {
msg.setMessageType(4);
msg.setChannel(mbEnums.ChatChannelType.SYSTEM.getChannelID());
DispatchMessage.dispatchMsgToAll(msg);
DispatchManager.dispatchMsgToAll(msg);
}
break;
}
src/engine/objects/Building.java
+6 -6
View File
@@ -17,6 +17,7 @@ import engine.db.archive.DataWarehouse;
import engine.db.archive.MineRecord;
import engine.gameManager.BuildingManager;
import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager;
import engine.gameManager.ZoneManager;
import engine.job.JobContainer;
import engine.job.JobScheduler;
@@ -28,7 +29,6 @@ import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.*;
import engine.net.ByteBufferWriter;
import engine.net.DispatchMessage;
import engine.net.client.msg.ApplyBuildingEffectMsg;
import engine.net.client.msg.UpdateObjectMsg;
import engine.server.MBServerStatics;
@@ -783,7 +783,7 @@ public class Building extends AbstractWorldObject {
public void removeAllVisualEffects() {
this.effectFlags = 0;
ApplyBuildingEffectMsg applyBuildingEffectMsg = new ApplyBuildingEffectMsg(3276859, 1, this.getObjectType().ordinal(), this.getObjectUUID(), 0);
DispatchMessage.sendToAllInRange(this, applyBuildingEffectMsg);
DispatchManager.sendToAllInRange(this, applyBuildingEffectMsg);
}
public void removeEffectBit(int bit) {
@@ -865,21 +865,21 @@ public class Building extends AbstractWorldObject {
WorldGrid.updateObject(this);
else {
UpdateObjectMsg uom = new UpdateObjectMsg(this, 3);
DispatchMessage.sendToAllInRange(this, uom);
DispatchManager.sendToAllInRange(this, uom);
}
}
public final void updateName() {
UpdateObjectMsg uom = new UpdateObjectMsg(this, 2);
DispatchMessage.sendToAllInRange(this, uom);
DispatchManager.sendToAllInRange(this, uom);
}
public final void refreshGuild() {
UpdateObjectMsg uom = new UpdateObjectMsg(this, 5);
DispatchMessage.sendToAllInRange(this, uom);
DispatchManager.sendToAllInRange(this, uom);
}
@@ -1157,7 +1157,7 @@ public class Building extends AbstractWorldObject {
public void updateEffects() {
ApplyBuildingEffectMsg applyBuildingEffectMsg = new ApplyBuildingEffectMsg(0x00720063, 1, this.getObjectType().ordinal(), this.getObjectUUID(), this.effectFlags);
DispatchMessage.sendToAllInRange(this, applyBuildingEffectMsg);
DispatchManager.sendToAllInRange(this, applyBuildingEffectMsg);
}
src/engine/objects/CharacterItemManager.java
+9 -13
View File
@@ -9,16 +9,12 @@
package engine.objects;
import engine.gameManager.BuildingManager;
import engine.gameManager.ConfigManager;
import engine.gameManager.DbManager;
import engine.gameManager.ItemManager;
import engine.gameManager.*;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.GameObjectType;
import engine.mbEnums.ItemType;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.*;
import engine.server.MBServerStatics;
@@ -364,7 +360,7 @@ public class CharacterItemManager {
ugm.configure();
Dispatch dispatch = Dispatch.borrow(player, ugm);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return success;
}
@@ -395,7 +391,7 @@ public class CharacterItemManager {
mca.setTargetType(mbEnums.GameObjectType.Building.ordinal());
mca.setTargetID(playerA.lastBuildingAccessed);
Dispatch dispatch = Dispatch.borrow(playerA, mca);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
playerA.lastBuildingAccessed = 0;
}
@@ -421,10 +417,10 @@ public class CharacterItemManager {
man2.getTradeCommitted());
dispatch = Dispatch.borrow((PlayerCharacter) this.getOwner(), modify);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
dispatch = Dispatch.borrow((PlayerCharacter) man2.getOwner(), modify);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return true;
@@ -447,7 +443,7 @@ public class CharacterItemManager {
CloseTradeWindowMsg closeMsg = new CloseTradeWindowMsg(source, tradeID);
dispatch = Dispatch.borrow(source, closeMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
if (!sourceTrade) {
sourceItemMan.endTrade();
@@ -1748,7 +1744,7 @@ public class CharacterItemManager {
UpdateInventoryMsg updateInventoryMsg = new UpdateInventoryMsg(inventory, this.getBank(), this.getGoldInventory(), add);
Dispatch dispatch = Dispatch.borrow(pc, updateInventoryMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
@@ -1773,7 +1769,7 @@ public class CharacterItemManager {
if (initialized) {
TransferItemFromEquipToInventoryMsg back = new TransferItemFromEquipToInventoryMsg(player, slot);
DispatchMessage.dispatchMsgToInterestArea(player, back, mbEnums.DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
DispatchManager.dispatchMsgToInterestArea(player, back, mbEnums.DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
}
}
@@ -1965,7 +1961,7 @@ public class CharacterItemManager {
ItemHealthUpdateMsg itemHealthUpdateMsg = new ItemHealthUpdateMsg(slot.ordinal(), (float) dur);
Dispatch dispatch = Dispatch.borrow(pc, itemHealthUpdateMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
src/engine/objects/CharacterRune.java
+2 -2
View File
@@ -10,9 +10,9 @@
package engine.objects;
import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager;
import engine.mbEnums.DispatchChannel;
import engine.net.ByteBufferWriter;
import engine.net.DispatchMessage;
import engine.net.client.msg.ApplyRuneMsg;
import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger;
@@ -143,7 +143,7 @@ public class CharacterRune extends AbstractGameObject {
//worked, send ApplyRuneMsg
if (worked) {
ApplyRuneMsg arm = new ApplyRuneMsg(pc.getObjectType().ordinal(), pc.getObjectUUID(), runeID, rune.getObjectType().ordinal(), rune.getObjectUUID(), true);
DispatchMessage.dispatchMsgToInterestArea(pc, arm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
DispatchManager.dispatchMsgToInterestArea(pc, arm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
CharacterSkill.calculateSkills(pc);
pc.applyBonuses();
return true;
src/engine/objects/City.java
+2 -3
View File
@@ -22,7 +22,6 @@ import engine.mbEnums;
import engine.mbEnums.*;
import engine.net.ByteBufferWriter;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.msg.ErrorPopupMsg;
import engine.net.client.msg.TaxResourcesMsg;
import engine.net.client.msg.ViewResourcesMsg;
@@ -1387,9 +1386,9 @@ public class City extends AbstractWorldObject {
vrm.setWarehouseBuilding(BuildingManager.getBuildingFromCache(building.getCity().warehouse.building.getObjectUUID()));
vrm.configure();
Dispatch dispatch = Dispatch.borrow(player, vrm);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return true;
}
src/engine/objects/Corpse.java
+2 -2
View File
@@ -13,6 +13,7 @@ import engine.InterestManagement.WorldGrid;
import engine.exception.SerializationException;
import engine.gameManager.BuildingManager;
import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager;
import engine.job.JobContainer;
import engine.job.JobScheduler;
import engine.jobs.RemoveCorpseJob;
@@ -20,7 +21,6 @@ import engine.mbEnums.GameObjectType;
import engine.mbEnums.GridObjectType;
import engine.mbEnums.ItemType;
import engine.net.ByteBufferWriter;
import engine.net.DispatchMessage;
import engine.net.client.msg.UnloadObjectsMsg;
import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger;
@@ -132,7 +132,7 @@ public class Corpse extends AbstractWorldObject {
//Remove from world
UnloadObjectsMsg uom = new UnloadObjectsMsg();
uom.addObject(corpse);
DispatchMessage.sendToAllInRange(corpse, uom);
DispatchManager.sendToAllInRange(corpse, uom);
WorldGrid.RemoveWorldObject(corpse);
//clear from cache
src/engine/objects/Group.java
+2 -2
View File
@@ -9,12 +9,12 @@
package engine.objects;
import engine.gameManager.DispatchManager;
import engine.gameManager.GroupManager;
import engine.job.JobScheduler;
import engine.jobs.UpdateGroupJob;
import engine.mbEnums;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.msg.group.GroupUpdateMsg;
import engine.server.MBServerStatics;
@@ -133,7 +133,7 @@ public class Group extends AbstractWorldObject {
for (PlayerCharacter pc : this.members) {
Dispatch dispatch = Dispatch.borrow(pc, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
}
src/engine/objects/Guild.java
+19 -20
View File
@@ -17,7 +17,6 @@ import engine.mbEnums;
import engine.mbEnums.*;
import engine.net.ByteBufferWriter;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.msg.AllianceChangeMsg;
import engine.net.client.msg.ErrorPopupMsg;
import engine.net.client.msg.UpdateClientAlliancesMsg;
@@ -347,7 +346,7 @@ public class Guild extends AbstractWorldObject {
if (Guild.sameGuild(player.getGuild(), toUpdate)) {
Dispatch dispatch = Dispatch.borrow(player, ucam);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
@@ -357,7 +356,7 @@ public class Guild extends AbstractWorldObject {
public static void UpdateClientAlliancesForPlayer(PlayerCharacter toUpdate) {
UpdateClientAlliancesMsg ucam = new UpdateClientAlliancesMsg(toUpdate.getGuild());
Dispatch dispatch = Dispatch.borrow(toUpdate, ucam);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
@@ -637,7 +636,7 @@ public class Guild extends AbstractWorldObject {
pc.setGuild(Guild.getErrantGuild());
pc.incVer();
DispatchMessage.sendToAllInRange(pc, new GuildInfoMsg(pc, Guild.getErrantGuild(), 2));
DispatchManager.sendToAllInRange(pc, new GuildInfoMsg(pc, Guild.getErrantGuild(), 2));
}
@@ -993,7 +992,7 @@ public class Guild extends AbstractWorldObject {
if (!Guild.sameGuild(player.getGuild(), this)) {
msg.setMsgType(AllianceChangeMsg.ERROR_NOT_SAME_GUILD);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1001,7 +1000,7 @@ public class Guild extends AbstractWorldObject {
if (!GuildStatusController.isInnerCouncil(player.getGuildStatus()) && !GuildStatusController.isGuildLeader(player.getGuildStatus())) {
msg.setMsgType(AllianceChangeMsg.ERROR_NOT_AUTHORIZED);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1009,7 +1008,7 @@ public class Guild extends AbstractWorldObject {
if (!GuildStatusController.isFullMember(player.getGuildStatus())) {
msg.setMsgType(AllianceChangeMsg.ERROR_NOT_AUTHORIZED);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
}
@@ -1027,7 +1026,7 @@ public class Guild extends AbstractWorldObject {
if (recommendList.size() == 10) {
msg.setMsgType(AllianceChangeMsg.ERROR_TOO_MANY);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1035,7 +1034,7 @@ public class Guild extends AbstractWorldObject {
ErrorPopupMsg.sendErrorMsg(player, "This guild is already recommonded!");
msg.setMsgType((byte) 15);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1058,7 +1057,7 @@ public class Guild extends AbstractWorldObject {
if (recommendList.size() == 10) {
msg.setMsgType(AllianceChangeMsg.ERROR_TOO_MANY);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1066,7 +1065,7 @@ public class Guild extends AbstractWorldObject {
ErrorPopupMsg.sendErrorMsg(player, "This guild is already recommonded!");
msg.setMsgType((byte) 15);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1088,7 +1087,7 @@ public class Guild extends AbstractWorldObject {
if (allyList.size() == 10) {
msg.setMsgType(AllianceChangeMsg.ERROR_TOO_MANY);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1096,7 +1095,7 @@ public class Guild extends AbstractWorldObject {
ErrorPopupMsg.sendErrorMsg(player, "This guild is already an Ally!");
msg.setMsgType((byte) 15);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1105,7 +1104,7 @@ public class Guild extends AbstractWorldObject {
Logger.error(this.getObjectUUID() + " Could not find alliance Guild");
msg.setMsgType((byte) 15);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1115,7 +1114,7 @@ public class Guild extends AbstractWorldObject {
Logger.error(this.getObjectUUID() + " failed to update alliance Database");
msg.setMsgType((byte) 15);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1132,7 +1131,7 @@ public class Guild extends AbstractWorldObject {
if (enemyList.size() == 10) {
msg.setMsgType(AllianceChangeMsg.ERROR_TOO_MANY);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1140,7 +1139,7 @@ public class Guild extends AbstractWorldObject {
ErrorPopupMsg.sendErrorMsg(player, "This guild is already an Enemy!");
msg.setMsgType((byte) 15);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1149,7 +1148,7 @@ public class Guild extends AbstractWorldObject {
Logger.error(this.getObjectUUID() + " Could not find alliance Guild");
msg.setMsgType((byte) 15);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1159,7 +1158,7 @@ public class Guild extends AbstractWorldObject {
Logger.error(this.getObjectUUID() + " failed to update alliance Database");
msg.setMsgType((byte) 15);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1177,7 +1176,7 @@ public class Guild extends AbstractWorldObject {
// once here everything passed, send successMsg;
msg.setMsgType(AllianceChangeMsg.INFO_SUCCESS);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return true;
}
src/engine/objects/Item.java
+3 -3
View File
@@ -12,13 +12,13 @@ package engine.objects;
import engine.exception.SerializationException;
import engine.gameManager.ConfigManager;
import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager;
import engine.gameManager.PowersManager;
import engine.mbEnums;
import engine.mbEnums.*;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.DeleteItemMsg;
import engine.powers.EffectsBase;
@@ -1069,7 +1069,7 @@ public class Item extends AbstractWorldObject {
DeleteItemMsg deleteItemMsg = new DeleteItemMsg(this.getObjectType().ordinal(), this.getObjectUUID());
charItemMan.cleanupDupe(this);
Dispatch dispatch = Dispatch.borrow(pc, deleteItemMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
@@ -1092,7 +1092,7 @@ public class Item extends AbstractWorldObject {
DeleteItemMsg deleteItemMsg = new DeleteItemMsg(this.getObjectType().ordinal(), this.getObjectUUID());
charItemMan.cleanupDupe(this);
Dispatch dispatch = Dispatch.borrow(pc, deleteItemMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return false;
}
return true;
src/engine/objects/Mob.java
+2 -3
View File
@@ -21,7 +21,6 @@ import engine.mbEnums;
import engine.mbEnums.*;
import engine.net.ByteBufferWriter;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.msg.PetMsg;
import engine.net.client.msg.PlaceAssetMsg;
import engine.server.MBServerStatics;
@@ -896,7 +895,7 @@ public class Mob extends AbstractIntelligenceAgent implements Delayed {
dispatch = Dispatch.borrow((PlayerCharacter) this.guardCaptain, petMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
}
}
@@ -924,7 +923,7 @@ public class Mob extends AbstractIntelligenceAgent implements Delayed {
petOwner.setPet(null);
PetMsg petMsg = new PetMsg(5, null);
dispatch = Dispatch.borrow(petOwner, petMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
}
} else {
src/engine/objects/NPC.java
+1 -2
View File
@@ -22,7 +22,6 @@ import engine.mbEnums;
import engine.mbEnums.*;
import engine.net.ByteBufferWriter;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.msg.PetMsg;
import engine.net.client.msg.PlaceAssetMsg;
import engine.server.MBServerStatics;
@@ -669,7 +668,7 @@ public class NPC extends AbstractCharacter {
PetMsg petMsg = new PetMsg(5, null);
Dispatch dispatch = Dispatch.borrow(petOwner, petMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
}
}
src/engine/objects/PlayerCharacter.java
+18 -19
View File
@@ -31,7 +31,6 @@ import engine.mbEnums;
import engine.mbEnums.*;
import engine.net.ByteBufferWriter;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.*;
import engine.net.client.msg.login.CommitNewCharacterMsg;
@@ -1478,7 +1477,7 @@ public class PlayerCharacter extends AbstractCharacter {
if (disable)
return;
UpdateCharOrMobMessage ucm = new UpdateCharOrMobMessage(pc, 2, pc.getRank());
DispatchMessage.sendToAllInRange(pc, ucm);
DispatchManager.sendToAllInRange(pc, ucm);
}
public static void GroundPlayer(PlayerCharacter groundee) {
@@ -1490,7 +1489,7 @@ public class PlayerCharacter extends AbstractCharacter {
ChangeAltitudeMsg msg = ChangeAltitudeMsg.GroundPlayerMsg(groundee);
// force a landing
DispatchMessage.dispatchMsgToInterestArea(groundee, msg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
DispatchManager.dispatchMsgToInterestArea(groundee, msg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
}
@@ -1899,7 +1898,7 @@ public class PlayerCharacter extends AbstractCharacter {
TargetedActionMsg targetedActionMsg = new TargetedActionMsg(this, true);
Dispatch dispatch = Dispatch.borrow(this, targetedActionMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
String message = this.getFirstName();
@@ -1959,7 +1958,7 @@ public class PlayerCharacter extends AbstractCharacter {
this.respawn(false, false, true);
} else {
TargetedActionMsg killmsg = new TargetedActionMsg(this, true);
DispatchMessage.dispatchMsgToInterestArea(this, killmsg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
DispatchManager.dispatchMsgToInterestArea(this, killmsg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
}
} catch (Exception e) {
Logger.error(e);
@@ -2665,7 +2664,7 @@ public class PlayerCharacter extends AbstractCharacter {
rm.setToken(skill.getToken());
Dispatch dispatch = Dispatch.borrow(this, rm);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
} else {
Logger.error("Failed to force refine of skill " + skill.getObjectUUID() + " by character " + this.getObjectUUID());
@@ -2912,7 +2911,7 @@ public class PlayerCharacter extends AbstractCharacter {
GrantExperienceMsg gem = new GrantExperienceMsg(this, remainingXP);
Dispatch dispatch = Dispatch.borrow(this, gem);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
this.addDatabaseJob("EXP", MBServerStatics.FIVE_MINUTES);
return;
@@ -2927,7 +2926,7 @@ public class PlayerCharacter extends AbstractCharacter {
GrantExperienceMsg grantExperienceMsg = new GrantExperienceMsg(this, remainingXP);
Dispatch dispatch = Dispatch.borrow(this, grantExperienceMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
this.addDatabaseJob("EXP", MBServerStatics.FIVE_MINUTES);
return;
@@ -2938,7 +2937,7 @@ public class PlayerCharacter extends AbstractCharacter {
GrantExperienceMsg grantExperienceMsg = new GrantExperienceMsg(this, remainingXP);
remainingXP = 0;
Dispatch dispatch = Dispatch.borrow(this, grantExperienceMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
this.addDatabaseJob("EXP", MBServerStatics.FIVE_MINUTES);
return;
@@ -2971,10 +2970,10 @@ public class PlayerCharacter extends AbstractCharacter {
GrantExperienceMsg grantExperienceMsg = new GrantExperienceMsg(this, 1);
Dispatch dispatch = Dispatch.borrow(this, grantExperienceMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
SetObjectValueMsg upm = new SetObjectValueMsg(this, 9);
DispatchMessage.dispatchMsgToInterestArea(this, upm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
DispatchManager.dispatchMsgToInterestArea(this, upm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
checkGuildStatus();
this.addDatabaseJob("EXP", MBServerStatics.FIVE_MINUTES);
// double overflow exp used up, remaining overflow will just add to level + 1.
@@ -2986,9 +2985,9 @@ public class PlayerCharacter extends AbstractCharacter {
this.overFlowEXP = 0;
GrantExperienceMsg grantExperienceMsg = new GrantExperienceMsg(this, 1);
Dispatch dispatch = Dispatch.borrow(this, grantExperienceMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
SetObjectValueMsg upm = new SetObjectValueMsg(this, 9);
DispatchMessage.dispatchMsgToInterestArea(this, upm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
DispatchManager.dispatchMsgToInterestArea(this, upm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
checkGuildStatus();
this.addDatabaseJob("EXP", MBServerStatics.FIVE_MINUTES);
}
@@ -3006,13 +3005,13 @@ public class PlayerCharacter extends AbstractCharacter {
GrantExperienceMsg grantExperienceMsg = new GrantExperienceMsg(this, neededXP);
Dispatch dispatch = Dispatch.borrow(this, grantExperienceMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
remainingXP -= neededXP;
//Send newLevel.
SetObjectValueMsg upm = new SetObjectValueMsg(this, 9);
DispatchMessage.dispatchMsgToInterestArea(this, upm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
DispatchManager.dispatchMsgToInterestArea(this, upm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
checkGuildStatus();
} else {
@@ -3020,7 +3019,7 @@ public class PlayerCharacter extends AbstractCharacter {
GrantExperienceMsg grantExperienceMsg = new GrantExperienceMsg(this, remainingXP);
remainingXP = 0;
Dispatch dispatch = Dispatch.borrow(this, grantExperienceMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
this.addDatabaseJob("EXP", MBServerStatics.FIVE_MINUTES);
}
@@ -4200,7 +4199,7 @@ public class PlayerCharacter extends AbstractCharacter {
toCommand.setCombatTarget(null);
PetMsg petMsg = new PetMsg(6, toCommand);
Dispatch dispatch = Dispatch.borrow(this, petMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
if (toCommand.isAlive())
WorldGrid.updateObject(toCommand);
@@ -4772,7 +4771,7 @@ public class PlayerCharacter extends AbstractCharacter {
ModifyHealthMsg modifyHealthMsg = new ModifyHealthMsg(null, this, 0, 1, 1, -1984683793, "", 0, 652920987);
//mhm.setOmitFromChat(0);
Dispatch dispatch = Dispatch.borrow(this, modifyHealthMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
}
@@ -4850,7 +4849,7 @@ public class PlayerCharacter extends AbstractCharacter {
moveToMsg.setSourceID(this.getObjectUUID());
Dispatch dispatch = Dispatch.borrow(this, moveToMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
try {
MovementManager.movement(moveToMsg, this);
src/engine/objects/PlayerFriends.java
+2 -2
View File
@@ -10,10 +10,10 @@
package engine.objects;
import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager;
import engine.mbEnums.DispatchChannel;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.msg.UpdateFriendStatusMessage;
import java.sql.ResultSet;
@@ -109,7 +109,7 @@ public class PlayerFriends {
UpdateFriendStatusMessage outMsg = new UpdateFriendStatusMessage(player);
outMsg.online = online;
Dispatch dispatch = Dispatch.borrow(friend, outMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
}
}
src/engine/objects/Warehouse.java
+8 -8
View File
@@ -11,10 +11,10 @@ package engine.objects;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager;
import engine.loot.WorkOrder;
import engine.mbEnums;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.*;
import engine.server.MBServerStatics;
@@ -111,7 +111,7 @@ public class Warehouse {
vrm.setWarehouseBuilding(warehouseBuilding);
vrm.configure();
dispatch = Dispatch.borrow(playerCharacter, vrm);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
public static void warehouseWithdraw(MerchantMsg msg, PlayerCharacter playerCharacter, NPC npc) {
@@ -157,7 +157,7 @@ public class Warehouse {
vrm.setWarehouseBuilding(warehouseBuilding);
vrm.configure();
dispatch = Dispatch.borrow(playerCharacter, vrm);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
public static void warehouseLock(MerchantMsg msg, PlayerCharacter playerCharacter, NPC npc) {
@@ -198,7 +198,7 @@ public class Warehouse {
vrm.setWarehouseBuilding(warehouseBuilding);
vrm.configure();
dispatch = Dispatch.borrow(playerCharacter, vrm);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
} else
warehouse.locked.add(resourceType);
@@ -215,7 +215,7 @@ public class Warehouse {
vrm.setWarehouseBuilding(warehouseBuilding);
vrm.configure();
dispatch = Dispatch.borrow(playerCharacter, vrm);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
} else
warehouse.locked.remove(resourceType);
@@ -279,7 +279,7 @@ public class Warehouse {
UpdateGoldMsg ugm = new UpdateGoldMsg(playerCharacter);
ugm.configure();
Dispatch dispatch = Dispatch.borrow(playerCharacter, ugm);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
itemMan.updateInventory();
@@ -464,7 +464,7 @@ public class Warehouse {
UpdateGoldMsg ugm = new UpdateGoldMsg(playerCharacter);
ugm.configure();
Dispatch dispatch = Dispatch.borrow(playerCharacter, ugm);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
itemMan.updateInventory();
} else {
@@ -537,7 +537,7 @@ public class Warehouse {
UpdateGoldMsg ugm = new UpdateGoldMsg(playerCharacter);
ugm.configure();
Dispatch dispatch = Dispatch.borrow(playerCharacter, ugm);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
itemMan.updateInventory();
} else {