Protected Hired Merchant + Buff system patch

Fixed some issues with Fredrick not retrieving the right amount of items from Hired Merchants. Added concurrency protection for HM. Patched a minor issue on buff system.
2017-09-26 00:18:14 -03:00
parent 28258530e4
commit de7e686a92
42 changed files with 500 additions and 131 deletions
--- a/build/built-jar.properties
+++ b/build/built-jar.properties
@@ -1,4 +1,4 @@
-#Mon, 25 Sep 2017 01:46:09 -0300
+#Tue, 26 Sep 2017 00:15:28 -0300


 C\:\\Nexon\\MapleSolaxia\\MapleSolaxiaV2=
--- a/build/classes/client/MapleCharacter$12.class
+++ b/build/classes/client/MapleCharacter$12.class
--- a/build/classes/client/MapleCharacter$13.class
+++ b/build/classes/client/MapleCharacter$13.class
--- a/build/classes/client/MapleCharacter$14.class
+++ b/build/classes/client/MapleCharacter$14.class
--- a/build/classes/client/MapleCharacter$15.class
+++ b/build/classes/client/MapleCharacter$15.class
--- a/build/classes/client/MapleCharacter$16.class
+++ b/build/classes/client/MapleCharacter$16.class
--- a/build/classes/client/MapleCharacter$17.class
+++ b/build/classes/client/MapleCharacter$17.class
--- a/build/classes/client/MapleCharacter$18.class
+++ b/build/classes/client/MapleCharacter$18.class
--- a/build/classes/client/MapleCharacter$19.class
+++ b/build/classes/client/MapleCharacter$19.class
--- a/build/classes/client/MapleCharacter$MapleBuffStatValueHolder.class
+++ b/build/classes/client/MapleCharacter$MapleBuffStatValueHolder.class
--- a/build/classes/client/MapleCharacter$MapleCoolDownValueHolder.class
+++ b/build/classes/client/MapleCharacter$MapleCoolDownValueHolder.class
--- a/build/classes/client/MapleCharacter$SkillEntry.class
+++ b/build/classes/client/MapleCharacter$SkillEntry.class
--- a/build/classes/client/MapleCharacter.class
+++ b/build/classes/client/MapleCharacter.class
--- a/build/classes/client/inventory/ItemFactory.class
+++ b/build/classes/client/inventory/ItemFactory.class
--- a/build/classes/constants/ServerConstants.class
+++ b/build/classes/constants/ServerConstants.class
--- a/build/classes/net/server/Server$1.class
+++ b/build/classes/net/server/Server$1.class
--- a/build/classes/net/server/Server.class
+++ b/build/classes/net/server/Server.class
--- a/build/classes/net/server/channel/handlers/HiredMerchantRequest.class
+++ b/build/classes/net/server/channel/handlers/HiredMerchantRequest.class
--- a/build/classes/net/server/channel/handlers/PlayerInteractionHandler$Action.class
+++ b/build/classes/net/server/channel/handlers/PlayerInteractionHandler$Action.class
--- a/build/classes/net/server/channel/handlers/PlayerInteractionHandler.class
+++ b/build/classes/net/server/channel/handlers/PlayerInteractionHandler.class
--- a/build/classes/net/server/channel/handlers/TakeDamageHandler.class
+++ b/build/classes/net/server/channel/handlers/TakeDamageHandler.class
--- a/build/classes/net/server/world/World$1.class
+++ b/build/classes/net/server/world/World$1.class
--- a/build/classes/net/server/world/World.class
+++ b/build/classes/net/server/world/World.class
--- a/build/classes/server/maps/HiredMerchant$SoldItem.class
+++ b/build/classes/server/maps/HiredMerchant$SoldItem.class
--- a/build/classes/server/maps/HiredMerchant.class
+++ b/build/classes/server/maps/HiredMerchant.class
--- a/build/classes/tools/MaplePacketCreator.class
+++ b/build/classes/tools/MaplePacketCreator.class