diff --git a/MobArena.jar b/MobArena.jar index 8897fc9..cb89d57 100644 Binary files a/MobArena.jar and b/MobArena.jar differ diff --git a/bin/plugin.yml b/bin/plugin.yml index 0699f68..ae4c99e 100644 --- a/bin/plugin.yml +++ b/bin/plugin.yml @@ -1,6 +1,6 @@ name: MobArena main: com.garbagemule.MobArena.MobArena -version: 0.91 +version: 0.91.1 softdepend: [MultiVerse] commands: ma: diff --git a/src/com/garbagemule/MobArena/MAUtils.java b/src/com/garbagemule/MobArena/MAUtils.java index b3b795f..cfdedc3 100644 --- a/src/com/garbagemule/MobArena/MAUtils.java +++ b/src/com/garbagemule/MobArena/MAUtils.java @@ -245,11 +245,14 @@ public class MAUtils if (ArenaManager.isRunning) { nmsWorld.allowMonsters = true; - nmsWorld.spawnMonsters = 1; + if (ArenaManager.spawnMonstersInt == 0) + nmsWorld.spawnMonsters = 1; } else { - nmsWorld.allowMonsters = false; + // If the server wasn't allowing monsters, set it back to false. + if (!ArenaManager.spawnMonsters) + nmsWorld.allowMonsters = false; nmsWorld.spawnMonsters = ArenaManager.spawnMonstersInt; } diff --git a/src/com/garbagemule/MobArena/MobArena.java b/src/com/garbagemule/MobArena/MobArena.java index 7a52fba..724ee52 100644 --- a/src/com/garbagemule/MobArena/MobArena.java +++ b/src/com/garbagemule/MobArena/MobArena.java @@ -2,7 +2,6 @@ package com.garbagemule.MobArena; import java.util.List; -import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.Event.Priority; import org.bukkit.event.block.BlockListener; @@ -83,9 +82,4 @@ public class MobArena extends JavaPlugin ArenaManager.forceEnd(null); } - - public boolean isPlaying(Player p) - { - return ArenaManager.playerSet.contains(p); - } } \ No newline at end of file