Rename and clean up MapleMarriage

src/main/java/client/Character.java

@@ -4759,11 +4759,11 @@ public class Character extends AbstractCharacterObject {
         }
     }
 
-    public MapleMarriage getMarriageInstance() {
+    public Marriage getMarriageInstance() {
         EventInstanceManager eim = getEventInstance();
 
-        if (eim != null || !(eim instanceof MapleMarriage)) {
+        if (eim != null || !(eim instanceof Marriage)) {
-            return (MapleMarriage) eim;
+            return (Marriage) eim;
         } else {
             return null;
         }

src/main/java/net/server/channel/handlers/WeddingHandler.java

@@ -18,7 +18,7 @@ import config.YamlConfig;
 import constants.inventory.ItemConstants;
 import net.AbstractPacketHandler;
 import net.packet.InPacket;
-import server.MapleMarriage;
+import server.Marriage;
 import tools.PacketCreator;
 import tools.packets.WeddingPackets;
 
@@ -44,7 +44,7 @@ public final class WeddingHandler extends AbstractPacketHandler {
                     int itemid = p.readInt();
                     short quantity = p.readShort();
 
-                    MapleMarriage marriage = c.getPlayer().getMarriageInstance();
+                    Marriage marriage = c.getPlayer().getMarriageInstance();
                     if (marriage != null) {
                         try {
                             boolean groomWishlist = marriage.giftItemToSpouse(chr.getId());
@@ -105,7 +105,7 @@ public final class WeddingHandler extends AbstractPacketHandler {
                     p.readByte();    // invType
                     int itemPos = p.readByte();
 
-                    MapleMarriage marriage = chr.getMarriageInstance();
+                    Marriage marriage = chr.getMarriageInstance();
                     if (marriage != null) {
                         Boolean groomWishlist = marriage.isMarriageGroom(chr);
                         if (groomWishlist != null) {
@@ -133,7 +133,7 @@ public final class WeddingHandler extends AbstractPacketHandler {
                             Item item = items.get(itemPos);
                             if (Inventory.checkSpot(chr, item)) {
                                 items.remove(itemPos);
-                                MapleMarriage.saveGiftItemsToDb(c, items, chr.getId());
+                                Marriage.saveGiftItemsToDb(c, items, chr.getId());
 
                                 InventoryManipulator.addFromDrop(c, item, true);
                                 c.sendPacket(WeddingPackets.onWeddingGiftResult((byte) 0xF, Collections.singletonList(""), items));

src/main/java/scripting/AbstractPlayerInteraction.java

@@ -37,7 +37,7 @@ import scripting.event.EventInstanceManager;
 import scripting.event.EventManager;
 import scripting.npc.NPCScriptManager;
 import server.ItemInformationProvider;
-import server.MapleMarriage;
+import server.Marriage;
 import server.expeditions.Expedition;
 import server.expeditions.ExpeditionBossLog;
 import server.expeditions.ExpeditionType;
@@ -1131,7 +1131,7 @@ public class AbstractPlayerInteraction {
         }
         
         public List<Item> getUnclaimedMarriageGifts() {
-            return MapleMarriage.loadGiftItemsFromDb(this.getClient(), this.getPlayer().getId());
+            return Marriage.loadGiftItemsFromDb(this.getClient(), this.getPlayer().getId());
         }
         
         public boolean startDungeonInstance(int dungeonid) {

src/main/java/scripting/event/EventManager.java

@@ -35,7 +35,7 @@ import net.server.world.Party;
 import net.server.world.PartyCharacter;
 import net.server.world.World;
 import scripting.event.scheduler.EventScriptScheduler;
-import server.MapleMarriage;
+import server.Marriage;
 import server.ThreadManager;
 import server.expeditions.Expedition;
 import server.life.LifeFactory;
@@ -244,8 +244,8 @@ public class EventManager {
         return ret;
     }
     
-    public MapleMarriage newMarriage(String name) throws EventInstanceInProgressException {
+    public Marriage newMarriage(String name) throws EventInstanceInProgressException {
-        MapleMarriage ret = new MapleMarriage(this, name);
+        Marriage ret = new Marriage(this, name);
         
         synchronized (instances) {
             if (instances.containsKey(name)) {

src/main/java/scripting/npc/NPCConversationManager.java

@@ -1066,7 +1066,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
         
         public void sendMarriageWishlist(boolean groom) {
             Character player = this.getPlayer();
-            MapleMarriage marriage = player.getMarriageInstance();
+            Marriage marriage = player.getMarriageInstance();
             if(marriage != null) {
                 int cid = marriage.getIntProperty(groom ? "groomId" : "brideId");
                 Character chr = marriage.getPlayerById(cid);
@@ -1086,7 +1086,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
         }
 
         public boolean createMarriageWishlist() {
-            MapleMarriage marriage = this.getPlayer().getMarriageInstance();
+            Marriage marriage = this.getPlayer().getMarriageInstance();
             if (marriage != null) {
                 Boolean groom = marriage.isMarriageGroom(this.getPlayer());
                 if (groom != null) {

src/main/java/server/Marriage.java

@@ -39,12 +39,10 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- *
  * @author Ronan
  */
-public class MapleMarriage extends EventInstanceManager {
+public class Marriage extends EventInstanceManager {
-    
+    public Marriage(EventManager em, String name) {
-    public MapleMarriage(EventManager em, String name) {
         super(em, name);
     }
 
@@ -111,7 +109,8 @@ public class MapleMarriage extends EventInstanceManager {
             } else if (chr.getId() == brideid) {
                 groom = false;
             }
-        } catch (NumberFormatException nfe) {}
+        } catch (NumberFormatException nfe) {
+        }
 
         return groom;
     }
@@ -150,7 +149,7 @@ public class MapleMarriage extends EventInstanceManager {
     }
 
     public void saveGiftItemsToDb(Client c, boolean groom, int cid) {
-        MapleMarriage.saveGiftItemsToDb(c, getGiftItems(c, groom), cid);
+        Marriage.saveGiftItemsToDb(c, getGiftItems(c, groom), cid);
     }
 
     public static void saveGiftItemsToDb(Client c, List<Item> giftItems, int cid) {