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