Resource Auto Stacking

src/engine/net/client/ClientMessagePump.java

@@ -446,6 +446,7 @@ public class ClientMessagePump implements NetMsgHandler {
         dispatch = Dispatch.borrow(player, msg);
         DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 
+        itemManager.StackResources();
     }
 
     private static void transferItemFromVaultToInventory(TransferItemFromVaultToInventoryMsg msg, ClientConnection origin) {
@@ -460,7 +461,7 @@ public class ClientMessagePump implements NetMsgHandler {
             return;
         player.getAccount().transferItemFromVaultToInventory(msg, origin);
 
-
+        player.getCharItemManager().StackResources();
     }
 
     //call this if the transfer fails server side to kick the item back to inventory from vault
@@ -489,7 +490,6 @@ public class ClientMessagePump implements NetMsgHandler {
 
         if (player.getAccount() == null)
             return;
-        player.getAccount().transferItemFromInventoryToVault(msg, origin);
 
     }
 
@@ -507,6 +507,7 @@ public class ClientMessagePump implements NetMsgHandler {
         DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 
         ChatManager.chatInfoError(player, "Can't transfer to vault: " + reason);
+        player.getAccount().transferItemFromInventoryToVault(msg, origin);
     }
 
     private static void transferGoldFromVaultToInventory(TransferGoldFromVaultToInventoryMsg msg, ClientConnection origin) {
@@ -992,6 +993,11 @@ public class ClientMessagePump implements NetMsgHandler {
                     String text = player.getFirstName() + " has looted " + name + '.';
                     ChatManager.chatGroupInfoCanSee(player, text);
                 }
+
+                if(item.getItemBase().getType().equals(ItemType.RESOURCE)){
+                    player.getCharItemManager().StackResources();
+                }
+
             } catch (Exception e) {
                 Logger.info(e.getMessage());
             } finally {
@@ -1608,7 +1614,9 @@ public class ClientMessagePump implements NetMsgHandler {
                     DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
                     itemMan.updateInventory();
                 }
-
+                if(buy.getItemBase().getType().equals(ItemType.RESOURCE)){
+                    itemMan.StackResources();
+                }
             } finally {
                 origin.buyLock.unlock();
             }