Merge branch 'master' into feat/postgresql-database

2023-07-25 17:03:35 +02:00
parent 46f767d79c d307eff71f
commit 855b66c459
2 changed files with 31 additions and 18 deletions
--- a/src/main/java/scripting/AbstractPlayerInteraction.java
+++ b/src/main/java/scripting/AbstractPlayerInteraction.java
@@ -140,6 +140,23 @@ public class AbstractPlayerInteraction {
        warpParty(id, portalId, mapid, mapid);
    }

+    public void warpParty(int map, String portalName) {
+
+        int mapid = getMapId();
+        var warpMap = c.getChannelServer().getMapFactory().getMap(map);
+
+        var portal = warpMap.getPortal(portalName);
+
+        if (portal == null) {
+            portal = warpMap.getPortal(0);
+        }
+
+        var portalId = portal.getId();
+
+        warpParty(map, portalId, mapid, mapid);
+
+    }
+
    public void warpParty(int id, int fromMinId, int fromMaxId) {
        warpParty(id, 0, fromMinId, fromMaxId);
    }