diff --git a/src/engine/net/client/ClientMessagePump.java b/src/engine/net/client/ClientMessagePump.java index 0643a62f..2489bce4 100644 --- a/src/engine/net/client/ClientMessagePump.java +++ b/src/engine/net/client/ClientMessagePump.java @@ -340,6 +340,11 @@ public class ClientMessagePump implements NetMsgHandler { if (player == null) return; + if(msg.getNumItems() < 1) { + ChatManager.chatSystemInfo(player, "You Have Attempted To Dupe. Please Don't"); + return;//catch gold dupe for negative numbers + } + if (!NPCVaultBankRangeCheck(player, origin, "bank")) return; @@ -397,6 +402,11 @@ public class ClientMessagePump implements NetMsgHandler { if (player == null) return; + if(msg.getNumItems() < 1) { + ChatManager.chatSystemInfo(player, "You Have Attempted To Dupe. Please Don't"); + return;//catch gold dupe for negative numbers + } + if (!NPCVaultBankRangeCheck(player, origin, "bank")) return; @@ -515,6 +525,11 @@ public class ClientMessagePump implements NetMsgHandler { if (player == null) return; + if(msg.getAmount() < 1) { + ChatManager.chatSystemInfo(player, "You Have Attempted To Dupe. Please Don't"); + return;//catch gold dupe for negative numbers + } + Account account = player.getAccount(); if (account == null) @@ -531,6 +546,11 @@ public class ClientMessagePump implements NetMsgHandler { if (player == null) return; + if(msg.getAmount() < 1) { + ChatManager.chatSystemInfo(player, "You Have Attempted To Dupe. Please Don't"); + return;//catch gold dupe for negative numbers + } + Account account = player.getAccount(); if (account == null) @@ -1871,6 +1891,9 @@ public class ClientMessagePump implements NetMsgHandler { s = SessionManager.getSession(origin); protocolMsg = msg.getProtocolMsg(); + PlayerCharacter player = ((ClientConnection) msg.getOrigin()).getPlayerCharacter(); + if(player != null) + player.lastAction = System.currentTimeMillis(); switch (protocolMsg) { case SETSELECTEDOBECT: diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index 4669c704..f803f633 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -177,6 +177,8 @@ public class PlayerCharacter extends AbstractCharacter { public float ZergMultiplier = 1.0f; public int mineAppliedID = 0; + + public long lastAction = 0; /** * No Id Constructor */ diff --git a/src/engine/objects/Warehouse.java b/src/engine/objects/Warehouse.java index c24513fc..bf8ee055 100644 --- a/src/engine/objects/Warehouse.java +++ b/src/engine/objects/Warehouse.java @@ -129,6 +129,12 @@ public class Warehouse extends AbstractWorldObject { public static void warehouseDeposit(MerchantMsg msg, PlayerCharacter player, NPC npc, ClientConnection origin) { + if(player.lastAction + 5000 > System.currentTimeMillis()){ + ChatManager.chatSystemInfo(player, "You Must Wait To Do This"); + return; + } + + Building warehouseBuilding; Warehouse warehouse; int depositAmount; @@ -140,6 +146,9 @@ public class Warehouse extends AbstractWorldObject { return; depositAmount = msg.getAmount(); + if(depositAmount < 1){ + ChatManager.chatSystemInfo(player, "You Have Attempted To Dupe. Please Don't"); + } CharacterItemManager itemMan = player.getCharItemManager(); if (itemMan.doesCharOwnThisItem(resource.getObjectUUID()) == false)