BadBird/BattleBane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Methods moved out of message pump

Browse Source
This commit is contained in:
MagicBot
2024-03-25 11:41:16 -04:00
parent 72ce1e0694
commit 063f3081b5
5 changed files with 133 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Account.java
+11 -10
View File
@@ -19,7 +19,8 @@ import engine.gameManager.SessionManager;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.ClientMessagePump;
import engine.net.client.handlers.ItemFromVaultMsgHandler;
import engine.net.client.handlers.ItemToVaultMsgHandler;
import engine.net.client.msg.*;
import engine.util.ByteUtils;
import org.pmw.tinylog.Logger;
@@ -202,7 +203,7 @@ public class Account extends AbstractGameObject {
return;
if (!NPCManager.NPCVaultBankRangeCheck(player, origin, "vault")) {
ClientMessagePump.forceTransferFromVaultToInventory(msg, origin, "You are out of range of the vault.");
ItemToVaultMsgHandler.forceTransferFromVaultToInventory(msg, origin, "You are out of range of the vault.");
return;
}
@@ -210,7 +211,7 @@ public class Account extends AbstractGameObject {
Item item = Item.getFromCache(uuid);
if (item == null) {
ClientMessagePump.forceTransferFromVaultToInventory(msg, origin, "Can't find the item.");
ItemToVaultMsgHandler.forceTransferFromVaultToInventory(msg, origin, "Can't find the item.");
return;
}
@@ -220,7 +221,7 @@ public class Account extends AbstractGameObject {
if (item.containerType == Enum.ItemContainerType.INVENTORY && player.charItemManager.isVaultOpen()) {
if (!player.charItemManager.hasRoomVault(item.template.item_wt)) {
ClientMessagePump.forceTransferFromVaultToInventory(msg, origin, "There is no room in your vault.");
ItemToVaultMsgHandler.forceTransferFromVaultToInventory(msg, origin, "There is no room in your vault.");
return;
}
@@ -229,7 +230,7 @@ public class Account extends AbstractGameObject {
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
} else
ClientMessagePump.forceTransferFromVaultToInventory(msg, origin, "Failed to transfer item.");
ItemToVaultMsgHandler.forceTransferFromVaultToInventory(msg, origin, "Failed to transfer item.");
}
}
@@ -242,21 +243,21 @@ public class Account extends AbstractGameObject {
return;
if (!NPCManager.NPCVaultBankRangeCheck(player, origin, "vault")) {
ClientMessagePump.forceTransferFromInventoryToVault(msg, origin, "You are out of range of the vault.");
ItemFromVaultMsgHandler.forceTransferFromInventoryToVault(msg, origin, "You are out of range of the vault.");
return;
}
CharacterItemManager itemManager = player.charItemManager;
if (itemManager == null) {
ClientMessagePump.forceTransferFromInventoryToVault(msg, origin, "Can't find your item manager.");
ItemFromVaultMsgHandler.forceTransferFromInventoryToVault(msg, origin, "Can't find your item manager.");
return;
}
Item item = Item.getFromCache(msg.getUUID());
if (item == null) {
ClientMessagePump.forceTransferFromInventoryToVault(msg, origin, "Can't find the item.");
ItemFromVaultMsgHandler.forceTransferFromInventoryToVault(msg, origin, "Can't find the item.");
return;
}
@@ -266,7 +267,7 @@ public class Account extends AbstractGameObject {
if (item.containerType == Enum.ItemContainerType.VAULT && itemManager.isVaultOpen()) {
if (!itemManager.hasRoomInventory(item.template.item_wt)) {
ClientMessagePump.forceTransferFromInventoryToVault(msg, origin, "There is no room in your inventory.");
ItemFromVaultMsgHandler.forceTransferFromInventoryToVault(msg, origin, "There is no room in your inventory.");
return;
}
if (itemManager.moveItemToInventory(item)) {
@@ -276,7 +277,7 @@ public class Account extends AbstractGameObject {
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
} else
ClientMessagePump.forceTransferFromInventoryToVault(msg, origin, "Failed to transfer item.");
ItemFromVaultMsgHandler.forceTransferFromInventoryToVault(msg, origin, "Failed to transfer item.");
}
}