Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2025-02-17 04:51:28 +01:00
Code Issues Projects Releases Wiki Activity

Chunk stuff, leave on death in lobby

Browse Source
This commit is contained in:
Garbage Mule 2011-07-09 10:10:42 +02:00
parent 7fc43e45db
commit 24f4146010
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
MobArena.jar
View File

Binary file not shown.

13
src/com/garbagemule/MobArena/Arena.java
View File

@ -264,6 +264,15 @@ public class Arena
if (!locations.containsKey(p)) if (!locations.containsKey(p))
locations.put(p,loc); 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); MAUtils.sitPets(p);
livePlayers.add(p); livePlayers.add(p);
p.teleport(lobbyLoc); p.teleport(lobbyLoc);
@ -861,9 +870,7 @@ public class Arena
} }
public void onEntityDeath(EntityDeathEvent event) public void onEntityDeath(EntityDeathEvent event)
{ {
if (!running) return;
if (event.getEntity() instanceof Player) if (event.getEntity() instanceof Player)
{ {
Player p = (Player) event.getEntity(); Player p = (Player) event.getEntity();

13
src/com/garbagemule/MobArena/MACommands.java
View File

@ -6,6 +6,7 @@ import java.util.Set;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Chunk;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Server; 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 * Player join
*/ */