Trade results + Map-Ownership & Fishing + P. EXP distribution rework

Fixed an issue where players could lose priority over recently dropped items after switching maps.
Adjusted EXP bonus buffs to also cover party bonus gains.
Fixed items taken back from merchants not properly checking for stacking opportunities in player inventory.
Fixed some merchant references in visitors' player object not being properly cleared when owner closes shop.
Adjusted merchants to automatically close as soon as the merchant owner finishes maintenance process with it having no items in store.
Added trade result opcodes. Trade results now should work almost as intended originally.
Implemented server-side check for portal distance when deploying player shops and merchants.
Implemented server-side check for whether local or remote IP is being used when logging in a local/remote server (this should mitigate a few of the issues people may find when trying to log in game world).
Implemented commands designed for management of opened IO sessions.
Fixed chalkboard not showing up for owner player when changing maps.
Added "time left" functionality for merchant owners managing the opened store.
Fixed skillbooks not showing properly for other players in the map.
Fixed commands using lowercased-version of content inputted by player.
Implemented the Fredrick expected fee on using the Store Bank service.
Implemented "exclusive invitation management" in the system. Inviters are notified the invited players are already managing an invite, should it be visually "in-progress" for that one.
Implemented "map ownership". Non-map owners are unable to farm in an area if they are not party members with the owner or until the ownership rescinds.
Adjusted inventory sort feature, now sorting projectile items in such a fashion that commonly stronger versions comes before the basic ones.
Added a visual effect that shows up when obtaining Aran skills.
Revised party EXP gain system. Party bonuses now accounts a fraction of the accumulated EXP gained by members when defeating a mob, and raw EXP gained by a player is kept the same regardless of him/her being in a party or not (thus a bonus being REALLY a bonus).
Implemented a custom fishing system in the source, on which during "seasonal" times (that gets arbitrarily defined by both day-of-year and time-of-day) fishes are more likely to be hooked. Such likelihood also improved depending on the amount of mesos spent as lure.

src/server/MapleTrade.java

@@ -36,14 +36,38 @@ import client.inventory.manipulator.MapleInventoryManipulator;
 import client.inventory.manipulator.MapleKarmaManipulator;
 import constants.GameConstants;
 import constants.ServerConstants;
+import net.server.coordinator.MapleInviteCoordinator;
+import net.server.coordinator.MapleInviteCoordinator.InviteResult;
+import net.server.coordinator.MapleInviteCoordinator.InviteType;
 import tools.Pair;
 
 /**
  *
  * @author Matze
- * @author Ronan - concurrency safety & check available slots
+ * @author Ronan - concurrency safety & check available slots & trade results
  */
 public class MapleTrade {
+    
+    public enum TradeResult {
+        NO_RESPONSE(1),
+        PARTNER_CANCEL(2),
+        SUCCESSFUL(7),
+        UNSUCCESSFUL(8),
+        UNSUCCESSFUL_UNIQUE_ITEM_LIMIT(9),
+        UNSUCCESSFUL_ANOTHER_MAP(12),
+        UNSUCCESSFUL_DAMAGED_FILES(13);
+        
+        private final int res;
+
+        private TradeResult(int res) {
+            this.res = res;
+        }
+        
+        private byte getValue() {
+            return (byte) res;
+        }
+    }
+    
     private MapleTrade partner = null;
     private List<Item> items = new ArrayList<>();
     private List<Item> exchangeItems;
@@ -88,6 +112,7 @@ public class MapleTrade {
     }
 
     private void completeTrade() {
+        byte result;
         boolean show = ServerConstants.USE_DEBUG;
         items.clear();
         meso = 0;
@@ -106,18 +131,21 @@ public class MapleTrade {
             } else {
                 chr.dropMessage(1, "Transaction completed. You received " + GameConstants.numberWithCommas(exchangeMeso) + " mesos.");
             }
+            
+            result = TradeResult.NO_RESPONSE.getValue();
         } else {
-            chr.dropMessage(1, "Transaction completed.");
+            result = TradeResult.SUCCESSFUL.getValue();
         }
         
         exchangeMeso = 0;
         if (exchangeItems != null) {
             exchangeItems.clear();
         }
-        chr.getClient().announce(MaplePacketCreator.getTradeCompletion(number));
+        
+        chr.getClient().announce(MaplePacketCreator.getTradeResult(number, result));
     }
 
-    private void cancel() {
+    private void cancel(byte result) {
         boolean show = ServerConstants.USE_DEBUG;
         
         for (Item item : items) {
@@ -134,7 +162,8 @@ public class MapleTrade {
         if (exchangeItems != null) {
             exchangeItems.clear();
         }
-        chr.getClient().announce(MaplePacketCreator.getTradeCancel(number));
+        
+        chr.getClient().announce(MaplePacketCreator.getTradeResult(number, result));
     }
 
     private boolean isLocked() {
@@ -224,6 +253,15 @@ public class MapleTrade {
         return MapleInventory.checkSpotsAndOwnership(chr, tradeItems);
     }
     
+    private boolean fitsUniquesInInventory() {
+        List<Integer> exchangeItemids = new LinkedList<>();
+        for (Item item : exchangeItems) {
+            exchangeItemids.add(item.getItemId());
+        }
+        
+        return chr.canHoldUniques(exchangeItemids);
+    }
+    
     private synchronized boolean checkTradeCompleteHandshake(boolean updateSelf) {
         MapleTrade self, other;
                 
@@ -259,32 +297,42 @@ public class MapleTrade {
             partner.fetchExchangedItems();
             
             if (!local.fitsMeso()) {
-                cancelTrade(c);
+                cancelTrade(local.getChr(), TradeResult.UNSUCCESSFUL);
                 c.message("There is not enough meso inventory space to complete the trade.");
                 partner.getChr().message("Partner does not have enough meso inventory space to complete the trade.");
                 return;
             } else if (!partner.fitsMeso()) {
-                cancelTrade(c);
+                cancelTrade(partner.getChr(), TradeResult.UNSUCCESSFUL);
                 c.message("Partner does not have enough meso inventory space to complete the trade.");
                 partner.getChr().message("There is not enough meso inventory space to complete the trade.");
                 return;
             }
             
             if (!local.fitsInInventory()) {
-                cancelTrade(c);
-                c.message("There is not enough inventory space to complete the trade.");
-                partner.getChr().message("Partner does not have enough inventory space to complete the trade.");
+                if (local.fitsUniquesInInventory()) {
+                    cancelTrade(local.getChr(), TradeResult.UNSUCCESSFUL);
+                    c.message("There is not enough inventory space to complete the trade.");
+                    partner.getChr().message("Partner does not have enough inventory space to complete the trade.");
+                } else {
+                    cancelTrade(local.getChr(), TradeResult.UNSUCCESSFUL_UNIQUE_ITEM_LIMIT);
+                    partner.getChr().message("Partner cannot hold more than one one-of-a-kind item at a time.");
+                }
                 return;
             } else if (!partner.fitsInInventory()) {
-                cancelTrade(c);
-                c.message("Partner does not have enough inventory space to complete the trade.");
-                partner.getChr().message("There is not enough inventory space to complete the trade.");
+                if (partner.fitsUniquesInInventory()) {
+                    cancelTrade(partner.getChr(), TradeResult.UNSUCCESSFUL);
+                    c.message("Partner does not have enough inventory space to complete the trade.");
+                    partner.getChr().message("There is not enough inventory space to complete the trade.");
+                } else {
+                    cancelTrade(partner.getChr(), TradeResult.UNSUCCESSFUL_UNIQUE_ITEM_LIMIT);
+                    c.message("Partner cannot hold more than one one-of-a-kind item at a time.");
+                }
                 return;
             }
             
             if (local.getChr().getLevel() < 15) {
                 if (local.getChr().getMesosTraded() + local.exchangeMeso > 1000000) {
-                    cancelTrade(c);
+                    cancelTrade(local.getChr(), TradeResult.NO_RESPONSE);
                     local.getChr().getClient().announce(MaplePacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day."));
                     return;
                 } else {
@@ -292,7 +340,7 @@ public class MapleTrade {
                 }
             } else if (partner.getChr().getLevel() < 15) {
                 if (partner.getChr().getMesosTraded() + partner.exchangeMeso > 1000000) {
-                    cancelTrade(c);
+                    cancelTrade(partner.getChr(), TradeResult.NO_RESPONSE);
                     partner.getChr().getClient().announce(MaplePacketCreator.serverNotice(1, "Characters under level 15 may not trade more than 1 million mesos per day."));
                     return;
                 } else {
@@ -309,74 +357,122 @@ public class MapleTrade {
         }
     }
     
-    private static void cancelTradeInternal(MapleCharacter chr) {
+    private static void cancelTradeInternal(MapleCharacter chr, byte selfResult, byte partnerResult) {
         MapleTrade trade = chr.getTrade();
         if(trade == null) return;
         
-        trade.cancel();
+        trade.cancel(selfResult);
         if (trade.getPartner() != null) {
-            trade.getPartner().cancel();
+            trade.getPartner().cancel(partnerResult);
             trade.getPartner().getChr().setTrade(null);
+            
+            MapleInviteCoordinator.answerInvite(InviteType.TRADE, trade.getChr().getId(), trade.getPartner().getChr().getId(), false);
+            MapleInviteCoordinator.answerInvite(InviteType.TRADE, trade.getPartner().getChr().getId(), trade.getChr().getId(), false);
         }
         chr.setTrade(null);
     }
     
-    private synchronized void tradeCancelHandshake(boolean updateSelf) {
+    private synchronized void tradeCancelHandshake(boolean updateSelf, byte result) {
+        byte selfResult, partnerResult;
         MapleTrade self;
-                
+        
+        partnerResult = result;
+        selfResult = (result == TradeResult.PARTNER_CANCEL.getValue() ? TradeResult.NO_RESPONSE.getValue() : result);
+        
         if (updateSelf) {
             self = this;
         } else {
             self = this.getPartner();
         }
         
-        cancelTradeInternal(self.getChr());
+        cancelTradeInternal(self.getChr(), selfResult, partnerResult);
     }
     
-    private void cancelHandshake() {  // handshake checkout thanks to Ronan
-        if (this.getChr().getId() < this.getPartner().getChr().getId()) {
-            this.tradeCancelHandshake(true);
+    private void cancelHandshake(byte result) {  // handshake checkout thanks to Ronan
+        MapleTrade partner = this.getPartner();
+        if (partner == null || this.getChr().getId() < partner.getChr().getId()) {
+            this.tradeCancelHandshake(true, result);
         } else {
-            this.getPartner().tradeCancelHandshake(false);
+            partner.tradeCancelHandshake(false, result);
         }
     }
 
-    public static void cancelTrade(MapleCharacter chr) {
+    public static void cancelTrade(MapleCharacter chr, TradeResult result) {
         MapleTrade trade = chr.getTrade();
         if(trade == null) return;
         
-        trade.cancelHandshake();
+        trade.cancelHandshake(result.getValue());
     }
     
     public static void startTrade(MapleCharacter c) {
         if (c.getTrade() == null) {
             c.setTrade(new MapleTrade((byte) 0, c));
-            c.getClient().announce(MaplePacketCreator.getTradeStart(c.getClient(), c.getTrade(), (byte) 0));
-        } else {
-            c.message("You are already in a trade.");
         }
     }
-
+    
+    private static boolean hasTradeInviteBack(MapleCharacter c1, MapleCharacter c2) {
+        MapleTrade other = c2.getTrade();
+        if (other != null) {
+            MapleTrade otherPartner = other.getPartner();
+            if (otherPartner != null) {
+                if (otherPartner.getChr().getId() == c1.getId()) {
+                    return true;
+                }
+            }
+        }
+        
+        return false;
+    }
+    
     public static void inviteTrade(MapleCharacter c1, MapleCharacter c2) {
-        if (c2.getTrade() == null) {
-            c2.setTrade(new MapleTrade((byte) 1, c2));
-            c2.getTrade().setPartner(c1.getTrade());
-            c1.getTrade().setPartner(c2.getTrade());
-            c2.getClient().announce(MaplePacketCreator.getTradeInvite(c1));
+        if (MapleInviteCoordinator.hasInvite(InviteType.TRADE, c1.getId())) {
+            if (hasTradeInviteBack(c1, c2)) {
+                c1.message("You are already managing this player's trade invitation.");
+            } else {
+                c1.message("You are already managing someone's trade invitation.");
+            }
+            
+            return;
+        } else if (c1.getTrade().isFullTrade()) {
+            c1.message("You are already in a trade.");
+            return;
+        }
+        
+        if (MapleInviteCoordinator.createInvite(InviteType.TRADE, c1, c1.getId(), c2.getId())) {
+            if (c2.getTrade() == null) {
+                c2.setTrade(new MapleTrade((byte) 1, c2));
+                c2.getTrade().setPartner(c1.getTrade());
+                c1.getTrade().setPartner(c2.getTrade());
+                
+                c1.getClient().announce(MaplePacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 0));
+                c2.getClient().announce(MaplePacketCreator.tradeInvite(c1));
+            } else {
+                c1.message("The other player is already trading with someone else.");
+                cancelTrade(c1, TradeResult.NO_RESPONSE);
+                MapleInviteCoordinator.answerInvite(InviteType.TRADE, c2.getId(), c1.getId(), false);
+            }
         } else {
-            c1.message("The other player is already trading with someone else.");
-            cancelTrade(c1);
+            c1.message("The other player is already managing someone else's trade invitation.");
+            cancelTrade(c1, TradeResult.NO_RESPONSE);
         }
     }
 
     public static void visitTrade(MapleCharacter c1, MapleCharacter c2) {
-        if (c1.getTrade() != null && c1.getTrade().getPartner() == c2.getTrade() && c2.getTrade() != null && c2.getTrade().getPartner() == c1.getTrade()) {
-            c2.getClient().announce(MaplePacketCreator.getTradePartnerAdd(c1));
-            c1.getClient().announce(MaplePacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 1));
-            c1.getTrade().setFullTrade(true);
-            c2.getTrade().setFullTrade(true);
+        Pair<InviteResult, MapleCharacter> inviteRes = MapleInviteCoordinator.answerInvite(InviteType.TRADE, c1.getId(), c2.getId(), true);
+        
+        InviteResult res = inviteRes.getLeft();
+        if (res == InviteResult.ACCEPTED) {
+            if (c1.getTrade() != null && c1.getTrade().getPartner() == c2.getTrade() && c2.getTrade() != null && c2.getTrade().getPartner() == c1.getTrade()) {
+                c2.getClient().announce(MaplePacketCreator.getTradePartnerAdd(c1));
+                c1.getClient().announce(MaplePacketCreator.getTradeStart(c1.getClient(), c1.getTrade(), (byte) 1));
+                c1.getTrade().setFullTrade(true);
+                c2.getTrade().setFullTrade(true);
+            } else {
+                c1.message("The other player has already closed the trade.");
+            }
         } else {
-            c1.message("The other player has already closed the trade.");
+            c1.message("This trade invitation already rescinded.");
+            cancelTrade(c1, TradeResult.NO_RESPONSE);
         }
     }
 
@@ -385,11 +481,15 @@ public class MapleTrade {
         if (trade != null) {
             if (trade.getPartner() != null) {
                 MapleCharacter other = trade.getPartner().getChr();
-                other.getTrade().cancel();
+                if (MapleInviteCoordinator.answerInvite(InviteType.TRADE, c.getId(), other.getId(), false).getLeft() == InviteResult.DENIED) {
+                    other.message(c.getName() + " has declined your trade request.");
+                }
+                
+                other.getTrade().cancel(TradeResult.PARTNER_CANCEL.getValue());
                 other.setTrade(null);
-                other.message(c.getName() + " has declined your trade request.");
+                
             }
-            trade.cancel();
+            trade.cancel(TradeResult.NO_RESPONSE.getValue());
             c.setTrade(null);
         }
     }

src/server/life/MapleMonster.java

@@ -460,47 +460,50 @@ public class MapleMonster extends AbstractLoadedMapleLife {
     public boolean isAttackedBy(MapleCharacter chr) {
         return takenDamage.containsKey(chr.getId());
     }
-
-    private void distributeExperienceToParty(int pid, float exp, int killer, int killerLevel, Set<MapleCharacter> underleveled, int minThresholdLevel) {
-        List<MapleCharacter> members = new LinkedList<>();
-        MapleCharacter pchar = getMap().getAnyCharacterFromParty(pid);
+    
+    private void distributeExperienceToParty(int pid, float exp, int mostDamageCid, int minThresholdLevel, int killerLevel, Set<MapleCharacter> underleveled, Map<MapleCharacter, Float> partyExpReward) {
+        MapleCharacter pchar = getMap().getAnyCharacterFromParty(pid);  // thanks G h o s t, Alfred, Vcoc, BHB for poiting out a bug in detecting party members after membership transactions in a party took place
+        
+        List<MapleCharacter> members;
         if(pchar != null) {
-            for(MapleCharacter chr : pchar.getPartyMembersOnSameMap()) {
-                members.add(chr);
-            }
+            members = pchar.getPartyMembersOnSameMap();
         } else {
-            MapleCharacter chr = getMap().getCharacterById(killer);
-            if(chr == null) return;
-            
-            members.add(chr);
+            members = new LinkedList<>();
         }
         
         List<MapleCharacter> expSharers = new LinkedList<>();
-        int expSharersLevel = 0;
+        int expSharersMaxLevel = 1;
+        boolean hasMostDamageCid = false;
         for (MapleCharacter mc : members) {
+            if (mc.getId() == mostDamageCid) {
+                hasMostDamageCid = true;
+            }
+            
             if (mc.getLevel() >= minThresholdLevel) {    //NO EXP WILL BE GIVEN for those who are underleveled!
                 if (Math.abs(killerLevel - mc.getLevel()) < ServerConstants.MIN_RANGELEVEL_TO_EXP_LEECH) {
                     // thanks Thora for pointing out leech level limitation
                     
-                    expSharersLevel += mc.getLevel();
+                    if (expSharersMaxLevel < mc.getLevel()) {
+                        expSharersMaxLevel = mc.getLevel();
+                    }
                     expSharers.add(mc);
                 }
             } else {
                 underleveled.add(mc);
             }
         }
-
-        final int mostDamageCid = getHighestDamagerId();
-
+        
+        int numExpSharers = expSharers.size();
+        
+        // PARTY BONUS: 2p -> +2% , 3p -> +4% , 4p -> +6% , 5p -> +8% , 6p -> +10%
+        // MOST DAMAGE BONUS: 1.5x bonus
+        final float partyModifier = numExpSharers <= 1 ? 0.0f : 0.02f * (numExpSharers - 1);
+        final float mostDamageModifier = hasMostDamageCid ? 1.5f : 1.0f;
+        final float partyExp = exp * partyModifier * mostDamageModifier;
+        
         for (MapleCharacter mc : expSharers) {
-            int id = mc.getId();
-            boolean isKiller = killer == id;
-            boolean mostDamage = mostDamageCid == id;
-            float xp = ((0.80f * exp * mc.getLevel()) / expSharersLevel);
-            if (mostDamage) {
-                xp += (0.20f * exp);
-            }
-            giveExpToCharacter(mc, xp, isKiller, expSharers.size());
+            float levelPenaltyModifier = (float) Math.sqrt(((float) mc.getLevel()) / expSharersMaxLevel);
+            partyExpReward.put(mc, partyExp * levelPenaltyModifier);
         }
     }
 
@@ -518,11 +521,26 @@ public class MapleMonster extends AbstractLoadedMapleLife {
         }
     }
     
+    private void propagateExperienceGains(Map<MapleCharacter, Float> personalExpReward, Map<MapleCharacter, Float> partyExpReward) {
+        Set<MapleCharacter> expRewardPlayers = new HashSet<>(personalExpReward.keySet());
+        expRewardPlayers.addAll(partyExpReward.keySet());
+        
+        for (MapleCharacter chr : expRewardPlayers) {
+            Float personalExp = personalExpReward.get(chr);
+            Float partyExp = partyExpReward.get(chr);
+            
+            this.giveExpToCharacter(chr, personalExp, partyExp);
+        }
+    }
+    
     private void distributeExperience(int killerId) {
         if (isAlive()) {
             return;
         }
         
+        Map<MapleCharacter, Float> personalExpReward = new HashMap<>();
+        Map<MapleCharacter, Float> partyExpReward = new HashMap<>();
+        
         EventInstanceManager eim = getMap().getEventInstance();
         int minThresholdLevel = calcThresholdLevel(eim != null), killerLevel = Integer.MAX_VALUE;
         int exp = getExp();
@@ -553,18 +571,18 @@ public class MapleMonster extends AbstractLoadedMapleLife {
                     xp += exp2;
                 }
                 
-                MapleParty p = mc.getParty();
-                if (p != null) {
-                    int pID = p.getId();
-                    float pXP = xp + (partyExp.containsKey(pID) ? partyExp.get(pID) : 0);
-                    partyExp.put(pID, pXP);
-                } else {
-                    if(mc.getLevel() >= minThresholdLevel) {
-                        //NO EXP WILL BE GIVEN for those who are underleveled!
-                        giveExpToCharacter(mc, xp, isKiller, 1);
-                    } else {
-                        underleveled.add(mc);
+                if(mc.getLevel() >= minThresholdLevel) {
+                    //NO EXP WILL BE GIVEN for those who are underleveled!
+                    personalExpReward.put(mc, xp);
+                    
+                    MapleParty p = mc.getParty();
+                    if (p != null) {    // for party bonus exp
+                        int pID = p.getId();
+                        float pXP = xp + (partyExp.containsKey(pID) ? partyExp.get(pID) : 0);
+                        partyExp.put(pID, pXP);
                     }
+                } else {
+                    underleveled.add(mc);
                 }
             }
         }
@@ -587,52 +605,78 @@ public class MapleMonster extends AbstractLoadedMapleLife {
             }
         }
         
+        int mostDamageCid = this.getHighestDamagerId();
         for (Entry<Integer, Float> party : partyExp.entrySet()) {
-            distributeExperienceToParty(party.getKey(), party.getValue(), killerId, killerLevel, underleveled, minThresholdLevel);
+            distributeExperienceToParty(party.getKey(), party.getValue(), mostDamageCid, minThresholdLevel, killerLevel, underleveled, partyExpReward);
         }
         
         for(MapleCharacter mc : underleveled) {
             mc.showUnderleveledInfo(this);
         }
-    }
-
-    private void giveExpToCharacter(MapleCharacter attacker, float exp, boolean isKiller, int numExpSharers) {
-        //PARTY BONUS: 2p -> +2% , 3p -> +4% , 4p -> +6% , 5p -> +8% , 6p -> +10%
-        final float partyModifier = numExpSharers <= 1 ? 0.0f : 0.02f * (numExpSharers - 1);
         
-        int partyExp = 0;
-        if (attacker.getHp() > 0) {
-            exp *= attacker.getExpRate();
+        propagateExperienceGains(personalExpReward, partyExpReward);
+    }
+    
+    private float getStatusExpMultiplier(MapleCharacter attacker) {
+        float multiplier = 1.0f;
+        
+        // thanks Prophecy & Aika for finding out Holy Symbol not being applied on party bonuses
+        Integer holySymbol = attacker.getBuffedValue(MapleBuffStat.HOLY_SYMBOL);
+        if (holySymbol != null) {
+            multiplier *= (1.0 + (holySymbol.doubleValue() / 100.0));
+        }
+
+        statiLock.lock();
+        try {
+            MonsterStatusEffect mse = stati.get(MonsterStatus.SHOWDOWN);
+            if (mse != null) {
+                multiplier *= (1.0 + (mse.getStati().get(MonsterStatus.SHOWDOWN).doubleValue() / 100.0));
+            }
+        } finally {
+            statiLock.unlock();
+        }
+        
+        return multiplier;
+    }
+    
+    private static int expValueToInteger(double exp) {
+        if (exp > Integer.MAX_VALUE) {
+            exp = Integer.MAX_VALUE;
+        } else if (exp < Integer.MIN_VALUE) {
+            exp = Integer.MIN_VALUE;
+        }
+        
+        return (int) exp;
+    }
+    
+    private void giveExpToCharacter(MapleCharacter attacker, Float personalExp, Float partyExp) {
+        if (attacker.isAlive()) {
+            if (personalExp != null) {
+                personalExp *= getStatusExpMultiplier(attacker);
+                personalExp *= attacker.getExpRate();
+            } else {
+                personalExp = 0.0f;
+            }
             
             Integer expBonus = attacker.getBuffedValue(MapleBuffStat.EXP_INCREASE);
-            if (expBonus != null) {     // exp increase buff found thanks to HighKey21
-                exp += expBonus;
+            if (expBonus != null) {     // exp increase player buff found thanks to HighKey21
+                personalExp += expBonus;
             }
-            
-            int personalExp = (int) exp;
-            if (exp <= Integer.MAX_VALUE) {  // assuming no negative xp here
-                if (partyModifier > 0.0f) {
-                    partyExp = (int) (personalExp * partyModifier * ServerConstants.PARTY_BONUS_EXP_RATE);
-                }
-                Integer holySymbol = attacker.getBuffedValue(MapleBuffStat.HOLY_SYMBOL);
-                if (holySymbol != null) {
-                    personalExp *= 1.0 + (holySymbol.doubleValue() / 100.0);
-                }
 
-                statiLock.lock();
-                try {
-                    if (stati.containsKey(MonsterStatus.SHOWDOWN)) {
-                        personalExp *= (stati.get(MonsterStatus.SHOWDOWN).getStati().get(MonsterStatus.SHOWDOWN).doubleValue() / 100.0 + 1.0);
-                    }
-                } finally {
-                    statiLock.unlock();
-                }
+            int _personalExp = expValueToInteger(personalExp); // assuming no negative xp here
+            
+            if (partyExp != null) {
+                partyExp *= getStatusExpMultiplier(attacker);
+                partyExp *= attacker.getExpRate();
+                partyExp *= ServerConstants.PARTY_BONUS_EXP_RATE;
             } else {
-                personalExp = Integer.MAX_VALUE;
+                partyExp = 0.0f;
             }
             
-            attacker.gainExp(personalExp, partyExp, true, false, isKiller);
-            attacker.increaseEquipExp(personalExp);
+            int _partyExp = expValueToInteger(partyExp);
+            
+            attacker.gainExp(_personalExp, _partyExp, true, false, false);
+            attacker.increaseEquipExp(_personalExp);
             attacker.updateQuestMobCount(getId());
         }
     }

src/server/maps/MapleGenericPortal.java

@@ -22,6 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package server.maps;
 
 import client.MapleClient;
+import client.MapleCharacter;
+import constants.GameConstants;
 import java.awt.Point;
 import scripting.portal.PortalScriptManager;
 import server.MaplePortal;
@@ -140,13 +142,18 @@ public class MapleGenericPortal implements MaplePortal {
                 npe.printStackTrace();
             }
         } else if (getTargetMapId() != 999999999) {
-            MapleMap to = c.getPlayer().getEventInstance() == null ? c.getChannelServer().getMapFactory().getMap(getTargetMapId()) : c.getPlayer().getEventInstance().getMapInstance(getTargetMapId());
-            MaplePortal pto = to.getPortal(getTarget());
-            if (pto == null) {// fallback for missing portals - no real life case anymore - interesting for not implemented areas
-                pto = to.getPortal(0);
+            MapleCharacter chr = c.getPlayer();
+            if (!(chr.getChalkboard() != null && GameConstants.isFreeMarketRoom(getTargetMapId()))) {
+                MapleMap to = chr.getEventInstance() == null ? c.getChannelServer().getMapFactory().getMap(getTargetMapId()) : chr.getEventInstance().getMapInstance(getTargetMapId());
+                MaplePortal pto = to.getPortal(getTarget());
+                if (pto == null) {// fallback for missing portals - no real life case anymore - interesting for not implemented areas
+                    pto = to.getPortal(0);
+                }
+                chr.changeMap(to, pto); //late resolving makes this harder but prevents us from loading the whole world at once
+                changed = true;
+            } else {
+                chr.dropMessage(5, "You cannot enter this map with the chalkboard opened.");
             }
-            c.getPlayer().changeMap(to, pto); //late resolving makes this harder but prevents us from loading the whole world at once
-            changed = true;
         }
         if (!changed) {
             c.announce(MaplePacketCreator.enableActions());

src/server/maps/MapleHiredMerchant.java

@@ -29,6 +29,7 @@ import client.inventory.MapleInventory;
 import client.inventory.MapleInventoryType;
 import client.inventory.manipulator.MapleInventoryManipulator;
 import client.inventory.manipulator.MapleKarmaManipulator;
+import client.processor.FredrickProcessor;
 import com.mysql.jdbc.Statement;
 import constants.ServerConstants;
 import java.sql.Connection;
@@ -191,6 +192,14 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
             visitorLock.unlock();
         }
     }
+    
+    private void removeOwner(MapleCharacter owner) {
+        if (owner.getHiredMerchant() == this) {
+            owner.announce(MaplePacketCreator.hiredMerchantOwnerLeave());
+            owner.announce(MaplePacketCreator.leaveHiredMerchant(0x00, 0x03));
+            owner.setHiredMerchant(null);
+        }
+    }
 
     public void withdrawMesos(MapleCharacter chr) {
         if (isOwner(chr)) {
@@ -220,6 +229,10 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
                 removeFromSlot(slot);
                 chr.announce(MaplePacketCreator.updateHiredMerchant(this, chr));
             }
+            
+            if (ServerConstants.USE_ENFORCE_MERCHANT_SAVE) {
+                chr.saveCharToDB(false);
+            }
         }
     }
     
@@ -228,15 +241,17 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
     }
     
     private int getQuantityLeft(int itemid) {
-        int count = 0;
-        
-        for (MaplePlayerShopItem mpsi : items) {
-            if (mpsi.getItem().getItemId() == itemid) {
-                count += (mpsi.getBundles() * mpsi.getItem().getQuantity());
+        synchronized (items) {
+            int count = 0;
+            
+            for (MaplePlayerShopItem mpsi : items) {
+                if (mpsi.getItem().getItemId() == itemid) {
+                    count += (mpsi.getBundles() * mpsi.getItem().getQuantity());
+                }
             }
+            
+            return count;
         }
-        
-        return count;
     }
     
     public void buy(MapleClient c, int item, short quantity) {
@@ -291,10 +306,14 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
                         }
                     }
                 } else {
-                    c.getPlayer().dropMessage(1, "Your inventory is full. Please clean a slot before buying this item.");
+                    c.getPlayer().dropMessage(1, "Your inventory is full. Please clear a slot before buying this item.");
+                    c.announce(MaplePacketCreator.enableActions());
+                    return;
                 }
             } else {
                 c.getPlayer().dropMessage(1, "You don't have enough mesos to purchase this item.");
+                c.announce(MaplePacketCreator.enableActions());
+                return;
             }
             try {
                 this.saveItems(false);
@@ -365,17 +384,18 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
 
     public void closeOwnerMerchant(MapleCharacter chr) {
         if(this.isOwner(chr)) {
-            chr.announce(MaplePacketCreator.hiredMerchantOwnerLeave());
-            chr.announce(MaplePacketCreator.leaveHiredMerchant(0x00, 0x03));
             this.closeShop(chr.getClient(), false);
             chr.setHasMerchant(false);
         }
     }
     
-    public void closeShop(MapleClient c, boolean timeout) {
+    private void closeShop(MapleClient c, boolean timeout) {
         map.removeMapObject(this);
         map.broadcastMessage(MaplePacketCreator.removeHiredMerchantBox(ownerId));
         c.getChannelServer().removeHiredMerchant(ownerId);
+        
+        this.removeAllVisitors();
+        this.removeOwner(c.getPlayer());
 
         try {
             MapleCharacter player = c.getWorldServer().getPlayerStorage().getCharacterById(ownerId);
@@ -412,6 +432,10 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
             } catch (Exception e) {
                 e.printStackTrace();
             }
+            
+            if (ServerConstants.USE_ENFORCE_MERCHANT_SAVE) {
+                c.getPlayer().saveCharToDB(false);
+            }
 
             synchronized (items) {
                 items.clear();
@@ -419,7 +443,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
+        
         Server.getInstance().getWorld(world).unregisterHiredMerchant(this);
     }
     
@@ -611,6 +635,8 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
         Connection con = DatabaseConnection.getConnection();
         ItemFactory.MERCHANT.saveItems(itemsWithType, bundles, this.ownerId, con);
         con.close();
+        
+        FredrickProcessor.insertFredrickLog(this.ownerId);
     }
 
     private static boolean check(MapleCharacter chr, List<MaplePlayerShopItem> items) {
@@ -629,8 +655,12 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
         return channel;
     }
 
-    public int getTimeLeft() {
-        return (int) ((System.currentTimeMillis() - start) / 1000);
+    public int getTimeOpen() {
+        double openTime = (System.currentTimeMillis() - start) / 60000;
+        openTime /= 1440;   // heuristics since engineered method to count time here is unknown
+        openTime *= 1318;
+        
+        return (int) Math.ceil(openTime);
     }
 
     public void clearMessages() {

src/server/maps/MapleMap.java

@@ -31,6 +31,7 @@ import client.inventory.MapleInventoryType;
 import client.inventory.MaplePet;
 import client.status.MonsterStatus;
 import client.status.MonsterStatusEffect;
+import constants.GameConstants;
 import constants.ItemConstants;
 import constants.ServerConstants;
 import java.awt.Point;
@@ -150,6 +151,8 @@ public class MapleMap {
     private Pair<Integer, String> timeMob = null;
     private short mobInterval = 5000;
     private boolean allowSummons = true; // All maps should have this true at the beginning
+    private MapleCharacter mapOwner = null;
+    private long mapOwnerLastActivityTime = Long.MAX_VALUE;
     
     // HPQ
     private int riceCakes = 0;
@@ -1088,6 +1091,18 @@ public class MapleMap {
             mdrop.unlockItem();
         }
     }
+    
+    public final void disappearingMesoDrop(final int meso, final MapleMapObject dropper, final MapleCharacter owner, final Point pos) {
+        final Point droppos = calcDropPos(pos, pos);
+        final MapleMapItem mdrop = new MapleMapItem(meso, droppos, dropper, owner, owner.getClient(), (byte) 1, false);
+        
+        mdrop.lockItem();
+        try {
+            broadcastItemDropMessage(mdrop, dropper.getPosition(), droppos, (byte) 3, mdrop.getPosition());
+        } finally {
+            mdrop.unlockItem();
+        }
+    }
 
     public MapleMonster getMonsterById(int id) {
         objectRLock.lock();
@@ -2254,23 +2269,13 @@ public class MapleMap {
     }
     
     public MapleCharacter getAnyCharacterFromParty(int partyid) {
-        chrRLock.lock();
-        try {
-            Set<Integer> list = mapParty.get(partyid);
-            if(list == null) return null;
-            
-            for(Integer cid : list) {
-                for (MapleCharacter c : this.characters) {
-                    if (c.getId() == cid) {
-                        return c;
-                    }
-                }
+        for (MapleCharacter chr : this.getAllPlayers()) {
+            if (chr.getPartyId() == partyid) {
+                return chr;
             }
-            
-            return null;
-        } finally {
-            chrRLock.unlock();
         }
+        
+        return null;
     }
     
     private void addPartyMemberInternal(MapleCharacter chr) {
@@ -2451,6 +2456,14 @@ public class MapleMap {
         
         chr.removeSandboxItems();
         
+        if (chr.getChalkboard() != null) {
+            if (!GameConstants.isFreeMarketRoom(mapid)) {
+                chr.announce(MaplePacketCreator.useChalkboard(chr, false)); // update player's chalkboard when changing maps found thanks to Vcoc
+            } else {
+                chr.setChalkboard(null);
+            }
+        }
+        
         if (chr.isHidden()) {
             broadcastGMSpawnPlayerMapObjectMessage(chr, chr, true);
             chr.announce(MaplePacketCreator.getGMEffect(0x10, (byte) 1));
@@ -2479,10 +2492,11 @@ public class MapleMap {
         } finally {
             objectWLock.unlock();
         }
+        
         if (chr.getPlayerShop() != null) {
             addMapObject(chr.getPlayerShop());
         }
-
+        
         final MapleDragon dragon = chr.getDragon();
         if (dragon != null) {
             dragon.setPosition(chr.getPosition());
@@ -2557,6 +2571,19 @@ public class MapleMap {
         return portal != null ? portal : getPortal(0);
     }
     
+    public MaplePortal findClosestWarpPortal(Point from) {
+        MaplePortal closest = null;
+        double shortestDistance = Double.POSITIVE_INFINITY;
+        for (MaplePortal portal : portals.values()) {
+            double distance = portal.getPosition().distanceSq(from);
+            if (portal.getType() == MaplePortal.MAP_PORTAL && distance < shortestDistance && portal.getTargetMapId() == 999999999) {
+                closest = portal;
+                shortestDistance = distance;
+            }
+        }
+        return closest;
+    }
+    
     public MaplePortal findClosestPlayerSpawnpoint(Point from) {
         MaplePortal closest = null;
         double shortestDistance = Double.POSITIVE_INFINITY;
@@ -4021,6 +4048,58 @@ public class MapleMap {
         }
     }
     
+    public boolean claimOwnership(MapleCharacter chr) {
+        if (mapOwner == null) {
+            mapOwner = chr;
+            mapOwnerLastActivityTime = Server.getInstance().getCurrentTime();
+            
+            getChannelServer().registerOwnedMap(this);
+            return true;
+        } else {
+            return chr == mapOwner;
+        }
+    }
+    
+    public boolean unclaimOwnership(MapleCharacter chr) {
+        if (mapOwner == chr) {
+            mapOwner = null;
+            mapOwnerLastActivityTime = Long.MAX_VALUE;
+            
+            getChannelServer().unregisterOwnedMap(this);
+            return true;
+        } else {
+            return false;
+        }
+    }
+    
+    private void refreshOwnership() {
+        mapOwnerLastActivityTime = Server.getInstance().getCurrentTime();
+    }
+    
+    public boolean isOwnershipRestricted(MapleCharacter chr) {
+        MapleCharacter owner = mapOwner;
+        
+        if (owner != null) {
+            if (owner != chr && !owner.isPartyMember(chr)) {    // thanks Vcoc & BHB for suggesting the map ownership feature
+                chr.showMapOwnershipInfo(owner);
+                return true;
+            } else {
+                this.refreshOwnership();
+            }
+        }
+        
+        return false;
+    }
+    
+    public void checkMapOwnerActivity() {
+        long timeNow = Server.getInstance().getCurrentTime();
+        if (timeNow - mapOwnerLastActivityTime > 60000) {
+            if (unclaimOwnership(mapOwner)) {
+                this.dropMessage(5, "This lawn is now free real estate.");
+            }
+        }
+    }
+    
     public void dispose() {
         for(MapleMonster mm : this.getMonsters()) {
             mm.dispose();

src/server/maps/MaplePlayerShop.java

@@ -146,6 +146,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
         try {
             for (int i = 0; i < 3; i++) {
                 if (visitors[i] != null && visitors[i].getId() == visitor.getId()) {
+                    visitors[i].setPlayerShop(null);
                     visitors[i] = null;
                     visitor.setSlot(-1);
                     
@@ -298,7 +299,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
                                 }
                             }
                         } else {
-                            c.getPlayer().dropMessage(1, "Your inventory is full. Please clean a slot before buying this item.");
+                            c.getPlayer().dropMessage(1, "Your inventory is full. Please clear a slot before buying this item.");
                             c.announce(MaplePacketCreator.enableActions());
                             return false;
                         }