* Fixed an issue allowing vanilla portals to still teleport player wi…

…thin a simple portal.
XZot1K · Jan 18, 2022 · b0ff968 · b0ff968
1 parent d643618
commit b0ff968
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 73 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/libraries/Maven__net_md_5_bungeecord_api_1_18_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__net_md_5_bungeecord_api_1_18_R0_1_SNAPSHOT.xml
diff --git a/.idea/libraries/Maven__net_md_5_bungeecord_chat_1_18_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__net_md_5_bungeecord_chat_1_18_R0_1_SNAPSHOT.xml
diff --git a/.idea/libraries/Maven__net_md_5_bungeecord_config_1_18_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__net_md_5_bungeecord_config_1_18_R0_1_SNAPSHOT.xml
diff --git a/.idea/libraries/Maven__net_md_5_bungeecord_event_1_18_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__net_md_5_bungeecord_event_1_18_R0_1_SNAPSHOT.xml
diff --git a/.idea/libraries/Maven__net_md_5_bungeecord_protocol_1_18_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__net_md_5_bungeecord_protocol_1_18_R0_1_SNAPSHOT.xml
diff --git a/.idea/libraries/Maven__org_spigotmc_spigot_api_1_18_1_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__org_spigotmc_spigot_api_1_18_1_R0_1_SNAPSHOT.xml
diff --git a/SimplePortals.iml b/SimplePortals.iml
@@ -23,12 +23,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-api:1.18-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.18-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-config:1.18-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-event:1.18-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-protocol:1.18-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:brigadier:1.0.16-SNAPSHOT" level="project" />
     <orderEntry type="module-library" scope="PROVIDED">
       <library>
         <CLASSES>
@@ -42,22 +36,10 @@
         <jarDirectory url="file://$MODULE_DIR$/../../Plugin Dependencies" recursive="false" type="SOURCES" />
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.18.1-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="module-library" scope="PROVIDED">
-      <library>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../Server Jars" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/../../Server Jars" />
-        </SOURCES>
-        <jarDirectory url="file://$MODULE_DIR$/../../Server Jars" recursive="false" />
-        <jarDirectory url="file://$MODULE_DIR$/../../Server Jars" recursive="false" type="SOURCES" />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-api:1.18-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.18-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.18.1-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.8" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: jline:jline:2.12.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-iostreams:2.14.1" level="project" />
@@ -106,6 +88,24 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.4.14" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-codec:4.1.72.Final" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-config:1.18-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-event:1.18-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-protocol:1.18-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:brigadier:1.0.16-SNAPSHOT" level="project" />
+    <orderEntry type="module-library" scope="PROVIDED">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../../Server Jars" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/../../Server Jars" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/../../Server Jars" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/../../Server Jars" recursive="false" type="SOURCES" />
+      </library>
+    </orderEntry>
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.sf.trove4j:core:3.1.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: se.llbit:jo-nbt:1.3.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-transport-native-unix-common:4.1.72.Final" level="project" />

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>xzot1k.plugins.sp</groupId>
     <artifactId>SimplePortals</artifactId>
-    <version>1.6.8</version>
+    <version>1.6.9</version>
     <packaging>jar</packaging>
 
     <name>SimplePortals</name>

diff --git a/src/main/java/xzot1k/plugins/sp/SimplePortals.java b/src/main/java/xzot1k/plugins/sp/SimplePortals.java
@@ -47,6 +47,7 @@ public void onEnable() {
         saveDefaultConfigs();
         reloadConfigs();
         updateConfigs();
+        getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
 
         setPrismaInstalled(getServer().getPluginManager().getPlugin("Prisma") != null);
         manager = new Manager(this);
@@ -78,6 +79,7 @@ public void onEnable() {
     @Override
     public void onDisable() {
         getServer().getScheduler().cancelTasks(this);
+        getServer().getMessenger().unregisterOutgoingPluginChannel(this);
     }
 
     private void updateConfigs() {

diff --git a/src/main/java/xzot1k/plugins/sp/api/Manager.java b/src/main/java/xzot1k/plugins/sp/api/Manager.java
@@ -4,6 +4,8 @@
 
 package xzot1k.plugins.sp.api;
 
+import com.google.common.io.ByteArrayDataOutput;
+import com.google.common.io.ByteStreams;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.configuration.ConfigurationSection;
@@ -724,16 +726,16 @@ public void clearAllVisuals(Player player) {
      */
     public void switchServer(Player player, String serverName) {
         try {
-            Bukkit.getMessenger().registerOutgoingPluginChannel(getPluginInstance(), "BungeeCord");
-            ByteArrayOutputStream byteArray = new ByteArrayOutputStream();
-            DataOutputStream out = new DataOutputStream(byteArray);
+            ByteArrayOutputStream b = new ByteArrayOutputStream();
+            DataOutputStream out = new DataOutputStream(b);
             out.writeUTF("Connect");
             out.writeUTF(serverName);
-            player.sendPluginMessage(getPluginInstance(), "BungeeCord", byteArray.toByteArray());
+            out.writeShort(b.toByteArray().length);
+            out.write(b.toByteArray());
+            player.sendPluginMessage(getPluginInstance(), "BungeeCord", b.toByteArray());
         } catch (Exception ex) {
             ex.printStackTrace();
-            getPluginInstance().log(Level.WARNING,
-                    "There seems to have been a issue when switching the player to the " + serverName + " server.");
+            getPluginInstance().log(Level.WARNING, "There seems to have been a issue when switching the player to the " + serverName + " server.");
         }
     }
 
@@ -790,7 +792,7 @@ public String getPortalName(Portal portal, boolean withCoordinates) {
      */
     public boolean handleVanillaPortalReplacements(Player player, World world, PortalType portalType) {
         for (String line : getPluginInstance().getConfig().getStringList((portalType == PortalType.NETHER ? "nether" : "end") + "-portal-locations")) {
-            if (line == null || line.isEmpty() || !line.contains(":") || !line.contains(",")) continue;
+            if (line == null || !line.contains(":") || !line.contains(",")) continue;
             String[] mainSplit = line.split(":");
             if (!mainSplit[0].equalsIgnoreCase(world.getName())) continue;
             String[] subSplit = mainSplit[1].split(",");