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

Rename MaplePortal

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:36:45 +02:00
parent 667bc69eb1
commit 7f4760ba1a
19 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,8 +46,8 @@ import server.life.Monster;
import server.life.NPC;
import server.maps.MapManager;
import server.maps.MapleMap;
import server.maps.MaplePortal;
import server.maps.MapleReactor;
import server.maps.Portal;
import tools.PacketCreator;
import tools.Pair;
@@ -1277,7 +1277,7 @@ public class EventInstanceManager {
thisStage--; //stages counts from ONE, scripts from ZERO
MapleMap nextStage = getMapInstance(thisMapId);
MaplePortal portal = nextStage.getPortal("next00");
Portal portal = nextStage.getPortal("next00");
if (portal != null) {
portal.setScriptName(eventFamily + thisStage);
}
@@ -1288,7 +1288,7 @@ public class EventInstanceManager {
thisStage--; //stages counts from ONE, scripts from ZERO
MapleMap nextStage = getMapInstance(thisMapId);
MaplePortal portal = nextStage.getPortal(portalName);
Portal portal = nextStage.getPortal(portalName);
if (portal != null) {
portal.setScriptName(scriptName);
}

8
src/main/java/scripting/portal/PortalPlayerInteraction.java
View File

@@ -24,7 +24,7 @@ package scripting.portal;
import client.Client;
import scripting.AbstractPlayerInteraction;
import scripting.map.MapScriptManager;
import server.maps.MaplePortal;
import server.maps.Portal;
import tools.DatabaseConnection;
import tools.PacketCreator;
@@ -34,14 +34,14 @@ import java.sql.ResultSet;
import java.sql.SQLException;
public class PortalPlayerInteraction extends AbstractPlayerInteraction {
private final MaplePortal portal;
private final Portal portal;
public PortalPlayerInteraction(Client c, MaplePortal portal) {
public PortalPlayerInteraction(Client c, Portal portal) {
super(c);
this.portal = portal;
}
public MaplePortal getPortal() {
public Portal getPortal() {
return portal;
}

4
src/main/java/scripting/portal/PortalScriptManager.java
View File

@@ -25,7 +25,7 @@ import client.Client;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import scripting.AbstractScriptManager;
import server.maps.MaplePortal;
import server.maps.Portal;
import javax.script.Invocable;
import javax.script.ScriptEngine;
@@ -64,7 +64,7 @@ public class PortalScriptManager extends AbstractScriptManager {
return script;
}
public boolean executePortalScript(MaplePortal portal, Client c) {
public boolean executePortalScript(Portal portal, Client c) {
try {
PortalScript script = getPortalScript(portal.getScriptName());
if (script != null) {