diff --git a/MobArena.jar b/MobArena.jar index 7b00cb0..2c9ccc9 100644 Binary files a/MobArena.jar and b/MobArena.jar differ diff --git a/src/com/garbagemule/MobArena/Arena.java b/src/com/garbagemule/MobArena/Arena.java index 97a1bdc..f71df17 100644 --- a/src/com/garbagemule/MobArena/Arena.java +++ b/src/com/garbagemule/MobArena/Arena.java @@ -264,6 +264,15 @@ public class Arena if (!locations.containsKey(p)) locations.put(p,loc); + if (livePlayers.isEmpty()) + { + Chunk chunk = world.getChunkAt(lobbyLoc); + if (!world.isChunkLoaded(chunk)) + world.loadChunk(chunk); + else + world.refreshChunk(chunk.getX(), chunk.getZ()); + } + MAUtils.sitPets(p); livePlayers.add(p); p.teleport(lobbyLoc); @@ -861,9 +870,7 @@ public class Arena } public void onEntityDeath(EntityDeathEvent event) - { - if (!running) return; - + { if (event.getEntity() instanceof Player) { Player p = (Player) event.getEntity(); diff --git a/src/com/garbagemule/MobArena/MACommands.java b/src/com/garbagemule/MobArena/MACommands.java index c347ed6..da5bf4c 100644 --- a/src/com/garbagemule/MobArena/MACommands.java +++ b/src/com/garbagemule/MobArena/MACommands.java @@ -6,6 +6,7 @@ import java.util.Set; import org.bukkit.Bukkit; import org.bukkit.ChatColor; +import org.bukkit.Chunk; import org.bukkit.DyeColor; import org.bukkit.Material; import org.bukkit.Server; @@ -111,6 +112,18 @@ public class MACommands implements CommandExecutor // ////////////////////////////////////////////////////////////////*/ + if (base.equals("unchunk")) + { + Arena arena = am.getArenaWithName(arg1); + Chunk chunk = arena.world.getChunkAt(arena.lobbyLoc); + //arena.world.unloadChunk(chunk.getX(), chunk.getZ(), false, false); + arena.world.unloadChunk(arena.lobbyLoc.getBlockX(), arena.lobbyLoc.getBlockZ()); + arena.world.unloadChunk(chunk.getX(), chunk.getZ()); + System.out.println("Chunk: " + chunk.getX() + "," + chunk.getZ()); + System.out.println("Lobby: " + arena.lobbyLoc.getBlockX() + "," + arena.lobbyLoc.getBlockZ()); + return true; + } + /* * Player join */