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

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