The great MCPQ Merge offensive

Fulfilled the lovely pull request #427 from @dragoso, which added in backing code content to HeavenMS.
Implemented structural changes for the Marriage wishlist, in order to receive, maintain and distribute gifts to spouses.
Added untradeable check on wishlist gift handler.
Adjusted CPQ drops to actually load from DB rathe than hard-coded.
Fixed CPQ "random disease to player/party" functionality not applying properly.
Adjusted how CPQ maps are generated. It directly loads a new area from WZ (this process should at least removes the player's spawned mobs) rather than reset the cache at every MCPQ creation.

src/scripting/event/EventInstanceManager.java

@@ -55,10 +55,16 @@ import tools.DatabaseConnection;
 import client.MapleCharacter;
 import client.SkillFactory;
 import client.Skill;
+import client.inventory.Item;
+import client.inventory.ItemFactory;
+import client.inventory.MapleInventory;
+import client.inventory.MapleInventoryType;
+import client.inventory.manipulator.MapleInventoryManipulator;
 import constants.ItemConstants;
 import constants.ServerConstants;
 import java.awt.Point;
 import java.sql.Connection;
+import java.util.Arrays;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
@@ -73,6 +79,7 @@ import server.ThreadManager;
 import server.life.MapleLifeFactory;
 import server.life.MapleNPC;
 import tools.MaplePacketCreator;
+import tools.Randomizer;
 
 /**
  *
@@ -89,6 +96,7 @@ public class EventInstanceManager {
 	private MapleMapFactory mapFactory;
 	private String name;
 	private Properties props = new Properties();
+        private Map<String, Object> objectProps = new HashMap<>();
 	private long timeStarted = 0;
 	private long eventTime = 0;
 	private MapleExpedition expedition = null;
@@ -628,6 +636,7 @@ public class EventInstanceManager {
                 killCount.clear();
                 mapIds.clear();
                 props.clear();
+                objectProps.clear();
                 
                 disposeExpedition();
                 
@@ -741,6 +750,15 @@ public class EventInstanceManager {
                         pL.unlock();
                 }
 	}
+        
+        public void setObjectProperty(String key, Object obj) {
+                pL.lock();
+                try {
+                        objectProps.put(key, obj);
+                } finally {
+                        pL.unlock();
+                }
+        }
 
 	public String getProperty(String key) {
                 pL.lock();
@@ -759,6 +777,15 @@ public class EventInstanceManager {
                         pL.unlock();
                 }
         }
+        
+        public Object getObjectProperty(String key) {
+                pL.lock();
+                try {
+                        return objectProps.get(key);
+                } finally {
+                        pL.unlock();
+                }
+        }
 	
 	public void leftParty(final MapleCharacter chr) {
                 try {