diff --git a/src/engine/Enum.java b/src/engine/Enum.java index 34560b52..22ab95c1 100644 --- a/src/engine/Enum.java +++ b/src/engine/Enum.java @@ -979,8 +979,8 @@ public class Enum { try { returnMod = SourceType.valueOf(modName.replace(",", "")); } catch (Exception e) { - Logger.error(modName); - Logger.error(e); + //Logger.error(modName); + //Logger.error(e); return SourceType.None; } return returnMod; diff --git a/src/engine/net/client/ClientMessagePump.java b/src/engine/net/client/ClientMessagePump.java index d483ae60..d6e4bb97 100644 --- a/src/engine/net/client/ClientMessagePump.java +++ b/src/engine/net/client/ClientMessagePump.java @@ -571,6 +571,11 @@ public class ClientMessagePump implements NetMsgHandler { return; if (i.isCanDestroy()) { + + if (i.getItemBase().isRune() && !sourcePlayer.isInSafeZone()) { + ChatManager.chatSystemInfo(sourcePlayer, "You May Only Delete Runes In A Safe Zone."); + return; + } int goldValue = i.getBaseValue(); if (i.getItemBase().isRune()) goldValue = 500000; @@ -578,7 +583,7 @@ public class ClientMessagePump implements NetMsgHandler { if (i.getItemBaseID() == 980066) goldValue = 0; - if(itemManager.getGoldInventory().getNumOfItems() + goldValue > 10000000) + if(itemManager.getGoldInventory().getNumOfItems() + goldValue > MBServerStatics.PLAYER_GOLD_LIMIT) return; if (itemManager.delete(i)) { @@ -792,6 +797,8 @@ public class ClientMessagePump implements NetMsgHandler { if (item == null) return; + item.stripCastableEnchants(); + if (item.lootLock.tryLock()) { try { Item itemRet = null; @@ -1287,7 +1294,7 @@ public class ClientMessagePump implements NetMsgHandler { cost *= profit; - if (gold.getNumOfItems() + cost > 10000000) { + if (gold.getNumOfItems() + cost > MBServerStatics.PLAYER_GOLD_LIMIT) { return; } @@ -1480,6 +1487,7 @@ public class ClientMessagePump implements NetMsgHandler { if (buy != null) { me.transferEnchants(buy); itemMan.addItemToInventory(buy); + buy.stripCastableEnchants(); if(npc.contractUUID == 900 && buy.getItemBaseID() == 1705032){ buy.setNumOfItems(10); DbManager.ItemQueries.UPDATE_NUM_ITEMS(buy,buy.getNumOfItems()); diff --git a/src/engine/objects/CharacterItemManager.java b/src/engine/objects/CharacterItemManager.java index 16376023..e5acc08a 100644 --- a/src/engine/objects/CharacterItemManager.java +++ b/src/engine/objects/CharacterItemManager.java @@ -1510,6 +1510,8 @@ public class CharacterItemManager { if (purchasedItem == null || npc == null) return false; + purchasedItem.stripCastableEnchants(); + itemMan = npc.getCharItemManager(); if (itemMan == null) @@ -2351,7 +2353,7 @@ public class CharacterItemManager { } - if (this.getGoldInventory().getNumOfItems() + goldFrom2 > 10000000) { + if (this.getGoldInventory().getNumOfItems() + goldFrom2 > MBServerStatics.PLAYER_GOLD_LIMIT) { PlayerCharacter pc = (PlayerCharacter) this.absCharacter; if (pc.getClientConnection() != null) ErrorPopupMsg.sendErrorPopup(pc, 202); @@ -2359,7 +2361,7 @@ public class CharacterItemManager { } - if (tradingWith.getGoldInventory().getNumOfItems() + goldFrom1 > 10000000) { + if (tradingWith.getGoldInventory().getNumOfItems() + goldFrom1 > MBServerStatics.PLAYER_GOLD_LIMIT) { PlayerCharacter pc = (PlayerCharacter) tradingWith.absCharacter; if (pc.getClientConnection() != null) ErrorPopupMsg.sendErrorPopup(pc, 202); diff --git a/src/engine/server/MBServerStatics.java b/src/engine/server/MBServerStatics.java index c4ee2d89..e9fdad66 100644 --- a/src/engine/server/MBServerStatics.java +++ b/src/engine/server/MBServerStatics.java @@ -33,11 +33,11 @@ public class MBServerStatics { // hit box // calcs public static final boolean PRINT_INCOMING_OPCODES = false; // print - public static final int BANK_GOLD_LIMIT = 25000000; + public static final int BANK_GOLD_LIMIT = 100000000; // incoming // opcodes to // console - public static final int PLAYER_GOLD_LIMIT = 10000000; + public static final int PLAYER_GOLD_LIMIT = 50000000; // buildings, npcs /* * Login cache flags @@ -379,6 +379,7 @@ public class MBServerStatics { // Mine related public static final int MINE_EARLY_WINDOW = 16; // 4pm public static final int MINE_LATE_WINDOW = 0; // Midnight + public static final Long THREE_MINUTES = 180000L; public static boolean DEBUG_PROTOCOL = false; public static int SPATIAL_HASH_BUCKETSX = 16384; public static int SPATIAL_HASH_BUCKETSY = 12288;