Revamped buff system + skill cd/buff schedule rework

Completely rearranged buff system (system can smartly check for the best
statup to take effect for it's duration, or the server can be flagged to
act as usual). Refactored scheduling system for buffs expiration and
cooldowns to use one single thread per player rather than one per
instance.

src/net/server/channel/handlers/PlayerInteractionHandler.java

@@ -32,6 +32,7 @@ import constants.ItemConstants;
 import java.util.Arrays;
 
 import net.AbstractMaplePacketHandler;
+import net.server.Server;
 import server.MapleInventoryManipulator;
 import server.MapleItemInformationProvider;
 import server.MapleMiniGame;
@@ -172,6 +173,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
                     } else {
                         HiredMerchant merchant = new HiredMerchant(chr, itemId, desc);
                         chr.setHiredMerchant(merchant);
+                        c.getWorldServer().registerHiredMerchant(merchant);
                         chr.getClient().getChannelServer().addHiredMerchant(chr.getId(), merchant);
                         chr.announce(MaplePacketCreator.getHiredMerchant(chr, merchant, true));
                     }