From b6a590d44fe9c06a212daf3c9d7b0dd212cbb9e6 Mon Sep 17 00:00:00 2001 From: RedSparr0w Date: Fri, 22 Nov 2019 20:45:18 +1300 Subject: [PATCH] Update PlayerAssistant.java --- .../redone/game/players/PlayerAssistant.java | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/2006Redone Server/src/redone/game/players/PlayerAssistant.java b/2006Redone Server/src/redone/game/players/PlayerAssistant.java index 0d6ba2d8..be9d6bb3 100644 --- a/2006Redone Server/src/redone/game/players/PlayerAssistant.java +++ b/2006Redone Server/src/redone/game/players/PlayerAssistant.java @@ -275,35 +275,40 @@ public class PlayerAssistant { public int backupInvItems[] = new int[28]; public int backupInvItemsN[] = new int[28]; - public void otherInv(Client c, Client o) { - if (o == c || o == null || c == null) - return; - for (int i = 0; i < o.playerItems.length; i++) { - backupInvItems[i] = c.playerItems[i]; - c.playerItemsN[i] = c.playerItemsN[i]; - c.playerItemsN[i] = o.playerItemsN[i]; - c.playerItems[i] = o.playerItems[i]; - } - c.getItemAssistant().updateInventory(); - - for (int i = 0; i < o.playerItems.length; i++) { - c.playerItemsN[i] = backupInvItemsN[i]; - c.playerItems[i] = backupInvItems[i]; - } - } + public void otherInv(Client c, Client o) { + if (o == c || o == null || c == null) + return; + for (int i = 0; i < o.playerItems.length; i++) { + backupInvItems[i] = c.playerItems[i]; + backupInvItemsN[i] = c.playerItemsN[i]; + c.playerItems[i] = o.playerItems[i]; + c.playerItemsN[i] = o.playerItemsN[i]; + } + c.getItemAssistant().updateInventory(); + for (int i = 0; i < o.playerItems.length; i++) { + c.playerItemsN[i] = backupInvItemsN[i]; + c.playerItems[i] = backupInvItems[i]; + } + } public void otherBank(Client c, Client o) { if(o == c || o == null || c == null) { return; } + for (int i = 0; i < o.bankItems.length; i++) { - backupItems[i] = c.bankItems[i]; backupItemsN[i] = c.bankItemsN[i]; - c.bankItemsN[i] = o.bankItemsN[i]; c.bankItems[i] = o.bankItems[i]; + backupItems[i] = c.bankItems[i]; + backupItemsN[i] = c.bankItemsN[i]; + c.bankItemsN[i] = o.bankItemsN[i]; + c.bankItems[i] = o.bankItems[i]; } + openUpBank(); + for (int i = 0; i < o.bankItems.length; i++) { - c.bankItemsN[i] = backupItemsN[i]; c.bankItems[i] = backupItems[i]; + c.bankItemsN[i] = backupItemsN[i]; + c.bankItems[i] = backupItems[i]; } }