Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleMarriage

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:46:32 +02:00
parent 9c8abf6f62
commit e31894caae
6 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/client/Character.java
View File

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

8
src/main/java/net/server/channel/handlers/WeddingHandler.java
View File

@@ -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));

4
src/main/java/scripting/AbstractPlayerInteraction.java
View File

@@ -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) {

6
src/main/java/scripting/event/EventManager.java
View File

@@ -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 {
MapleMarriage ret = new MapleMarriage(this, name);
public Marriage newMarriage(String name) throws EventInstanceInProgressException {
Marriage ret = new Marriage(this, name);
synchronized (instances) {
if (instances.containsKey(name)) {

4
src/main/java/scripting/npc/NPCConversationManager.java
View File

@@ -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) {

25
src/main/java/server/MapleMarriage.java → src/main/java/server/Marriage.java
View File

@@ -39,15 +39,13 @@ import java.util.LinkedList;
import java.util.List;
/**
*
* @author Ronan
*/
public class MapleMarriage extends EventInstanceManager {
public MapleMarriage(EventManager em, String name) {
public class Marriage extends EventInstanceManager {
public Marriage(EventManager em, String name) {
super(em, name);
}
public boolean giftItemToSpouse(int cid) {
return this.getIntProperty("wishlistSelection") == 0;
}
@@ -101,7 +99,7 @@ public class MapleMarriage extends EventInstanceManager {
gifts.remove(item);
}
}
public Boolean isMarriageGroom(Character chr) {
Boolean groom = null;
try {
@@ -111,7 +109,8 @@ public class MapleMarriage extends EventInstanceManager {
} else if (chr.getId() == brideid) {
groom = false;
}
} catch (NumberFormatException nfe) {}
} catch (NumberFormatException nfe) {
}
return groom;
}
@@ -134,10 +133,10 @@ public class MapleMarriage extends EventInstanceManager {
return false;
}
public static List<Item> loadGiftItemsFromDb(Client c, int cid) {
List<Item> items = new LinkedList<>();
try {
for (Pair<Item, InventoryType> it : ItemFactory.MARRIAGE_GIFTS.loadItems(cid, false)) {
items.add(it.getLeft());
@@ -145,14 +144,14 @@ public class MapleMarriage extends EventInstanceManager {
} catch (SQLException sqle) {
sqle.printStackTrace();
}
return items;
}
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) {
List<Pair<Item, InventoryType>> items = new LinkedList<>();
for (Item it : giftItems) {