Sweetgum/sweetgum-server
1
1
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
src/main/java/scripting/AbstractPlayerInteraction.java
+2 -2
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) {
src/main/java/scripting/event/EventManager.java
+3 -3
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)) {
src/main/java/scripting/npc/NPCConversationManager.java
+2 -2
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) {