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

fix joining from other arenas (hopefully), readd missing block destroy check

Browse Source
This commit is contained in:
Brian 2012-05-19 17:30:20 -04:00
parent 806583f41a
commit 10147532a5
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/garbagemule/MobArena/ArenaListener.java
View File

@ -169,11 +169,14 @@ public class ArenaListener
return false;
// Below this, arena is running - ACStache
Block b = event.getBlock();
if (arena.removeBlock(b) || b.getType() == Material.TNT)
return true;
if (softRestore) {
if (arena.isProtected())
return false;
Block b = event.getBlock();
BlockState state = b.getState();
Repairable r = null;
@ -188,7 +191,7 @@ public class ArenaListener
arena.addRepairable(r);
if(!softRestoreDrops)
if (!softRestoreDrops)
b.setTypeId(0);
return true;
}

6
src/com/garbagemule/MobArena/commands/user/JoinCommand.java
View File

@ -34,6 +34,12 @@ public class JoinCommand implements Command
return false;
}
// Deny joining from other arenas
if (am.getArenaWithPlayer(p) != null) {
Messenger.tellPlayer(p, Msg.JOIN_ALREADY_PLAYING);
return false;
}
// Per-arena sanity checks
if (!arena.canJoin(p)) {
return false;

2
src/com/garbagemule/MobArena/util/ItemParser.java
View File

@ -149,7 +149,7 @@ public class ItemParser
}
private static ItemStack withDataAndAmount(String item, String data, String amount) {
Material m = getMaterial(item.toUpperCase());
Material m = getMaterial(item);
short d = getData(data, m);
int a = getAmount(amount);