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

Handlers created for vault interactions

Browse Source
This commit is contained in:
MagicBot
2024-03-24 10:12:16 -04:00
parent e7e32ca4ef
commit 5439df5653
7 changed files with 113 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/ClientMessagePump.java
+4 -39
View File
@@ -155,23 +155,8 @@ public class ClientMessagePump implements NetMsgHandler {
DispatchMessage.dispatchMsgToInterestArea(pc, msg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, true);
}
private static void transferItemFromVaultToInventory(TransferItemFromVaultToInventoryMsg msg, ClientConnection origin) {
PlayerCharacter player = origin.getPlayerCharacter();
Dispatch dispatch;
if (player == null)
return;
if (player.getAccount() == null)
return;
player.getAccount().transferItemFromVaultToInventory(msg, origin);
}
//call this if the transfer fails server side to kick the item back to inventory from vault
public static void forceTransferFromInventoryToVault(TransferItemFromVaultToInventoryMsg msg, ClientConnection origin, String reason) {
public static void forceTransferFromInventoryToVault(ItemFromVaultMsg msg, ClientConnection origin, String reason) {
PlayerCharacter player = origin.getPlayerCharacter();
Dispatch dispatch;
@@ -179,29 +164,15 @@ public class ClientMessagePump implements NetMsgHandler {
if (player == null)
return;
TransferItemFromInventoryToVaultMsg back = new TransferItemFromInventoryToVaultMsg(msg);
ItemToVaultMsg back = new ItemToVaultMsg(msg);
dispatch = Dispatch.borrow(player, back);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
ChatManager.chatInfoError(player, "Can't transfer to inventory: " + reason);
}
private static void transferItemFromInventoryToVault(TransferItemFromInventoryToVaultMsg msg, ClientConnection origin) {
PlayerCharacter player = origin.getPlayerCharacter();
Dispatch dispatch;
if (player == null)
return;
if (player.getAccount() == null)
return;
player.getAccount().transferItemFromInventoryToVault(msg, origin);
}
//call this if the transfer fails server side to kick the item back to vault from inventory
public static void forceTransferFromVaultToInventory(TransferItemFromInventoryToVaultMsg msg, ClientConnection origin, String reason) {
public static void forceTransferFromVaultToInventory(ItemToVaultMsg msg, ClientConnection origin, String reason) {
PlayerCharacter player = origin.getPlayerCharacter();
Dispatch dispatch;
@@ -209,7 +180,7 @@ public class ClientMessagePump implements NetMsgHandler {
if (player == null)
return;
TransferItemFromVaultToInventoryMsg back = new TransferItemFromVaultToInventoryMsg(msg);
ItemFromVaultMsg back = new ItemFromVaultMsg(msg);
dispatch = Dispatch.borrow(player, back);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
@@ -1173,12 +1144,6 @@ public class ClientMessagePump implements NetMsgHandler {
case SHOWCOMBATINFO:
show((ShowMsg) msg, origin);
break;
case TRANSFERITEMFROMVAULTTOINVENTORY:
transferItemFromVaultToInventory((TransferItemFromVaultToInventoryMsg) msg, origin);
break;
case ITEMTOVAULT:
transferItemFromInventoryToVault((TransferItemFromInventoryToVaultMsg) msg, origin);
break;
case TRANSFERGOLDFROMVAULTTOINVENTORY:
transferGoldFromVaultToInventory((TransferGoldFromVaultToInventoryMsg) msg, origin);
break;