Some fixes

SocketByte · Apr 9, 2018 · b6b5069 · b6b5069
1 parent 5d0e8b0
commit b6b5069
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/OpenSectorLinker/src/main/java/pl/socketbyte/opensectors/linker/OpenSectorLinker.java b/OpenSectorLinker/src/main/java/pl/socketbyte/opensectors/linker/OpenSectorLinker.java
@@ -237,14 +237,6 @@ public static void ready() {
         log().info("Loading sectors...");
         SectorManager.INSTANCE.load();
 
-        log().info("Applying world border...");
-        World world = Bukkit.getWorlds().get(0);
-
-        WorldBorder worldBorder = world.getWorldBorder();
-        worldBorder.setSize(config.border * 2);
-        worldBorder.setCenter(0, 0);
-        log().info("Ready!");
-
         log().info("Running metrics...");
         Metrics metrics = new Metrics(OpenSectorLinker.getInstance());
     }

diff --git a/...ectorLinker/src/main/java/pl/socketbyte/opensectors/linker/listeners/PlayerListeners.java b/...ectorLinker/src/main/java/pl/socketbyte/opensectors/linker/listeners/PlayerListeners.java
@@ -2,9 +2,6 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -14,7 +11,6 @@
 import pl.socketbyte.opensectors.linker.OpenSectorLinker;
 import pl.socketbyte.opensectors.linker.adapters.player.PlayerTeleportListener;
 import pl.socketbyte.opensectors.linker.api.callback.CallbackWaiter;
-import pl.socketbyte.opensectors.linker.api.callback.ParametrizedCallback;
 import pl.socketbyte.opensectors.linker.json.controllers.ServerController;
 import pl.socketbyte.opensectors.linker.logging.StackTraceHandler;
 import pl.socketbyte.opensectors.linker.logging.StackTraceSeverity;
@@ -80,6 +76,8 @@ public void onPlayerJoin(PlayerJoinEvent event) {
 
         event.setJoinMessage(null);
 
+        // PlayerBorderContainer.pull(player);
+
         PacketPlayerInfo packet = PlayerInfoHolder.pull(player);
         if (packet == null)
             return;

diff --git a/...orLinker/src/main/java/pl/socketbyte/opensectors/linker/listeners/PlayerMoveListener.java b/...orLinker/src/main/java/pl/socketbyte/opensectors/linker/listeners/PlayerMoveListener.java
@@ -2,7 +2,6 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -14,7 +13,8 @@
 import pl.socketbyte.opensectors.linker.packet.PacketPlayerTransfer;
 import pl.socketbyte.opensectors.linker.sector.Sector;
 import pl.socketbyte.opensectors.linker.sector.SectorManager;
-import pl.socketbyte.opensectors.linker.util.*;
+import pl.socketbyte.opensectors.linker.util.NetworkManager;
+import pl.socketbyte.opensectors.linker.util.PlayerTransferHolder;
 import pl.socketbyte.opensectors.linker.util.reflection.ProtocolManager;
 
 import java.text.DecimalFormat;

diff --git a/OpenSectorLinker/src/main/java/pl/socketbyte/opensectors/linker/sector/Sector.java b/OpenSectorLinker/src/main/java/pl/socketbyte/opensectors/linker/sector/Sector.java
@@ -74,6 +74,10 @@ public boolean isIn(Location location) {
                 && (location.getBlockZ() < this.upper.getBlockZ());
     }
 
+    public boolean isIn(int x, int z) {
+        return isIn(new Location(world, x, 100, z));
+    }
+
     public ServerController getServerController() {
         return serverController;
     }

diff --git a/OpenSectorLinker/src/main/java/pl/socketbyte/opensectors/linker/sector/SectorManager.java b/OpenSectorLinker/src/main/java/pl/socketbyte/opensectors/linker/sector/SectorManager.java
@@ -34,6 +34,14 @@ public boolean isIn(Location loc) {
         return false;
     }
 
+    public boolean isIn(int x, int z) {
+        for (Sector sector : sectorMap.values())
+            if (sector.isIn(x, z)
+                    && sector.getServerController().id != OpenSectorLinker.getServerId())
+                return true;
+        return false;
+    }
+
     public boolean isNear(Location location) {
         for (Sector sector : sectorMap.values()) {
             if (sector.isNear(location))