skywalker3200/MobArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Swap order for vertical layouts.

Browse Source
This commit is contained in:
Andreas Troelsen
2013-01-26 04:11:52 +01:00
parent 646a31da73
commit ad8a99acda
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/garbagemule/MobArena/ArenaListener.java
+20 -1
View File
@@ -837,9 +837,20 @@ public class ArenaListener
if (!className.equalsIgnoreCase("random")) {
if (useClassChests) {
BlockFace backwards = ((org.bukkit.material.Sign) sign.getData()).getFacing().getOppositeFace();
Block blockBelow = sign.getBlock();
Block blockSign = sign.getBlock();
Block blockBelow = blockSign.getRelative(BlockFace.DOWN);
Block blockBehind = blockBelow.getRelative(backwards);
// If the block below this sign is a class sign, swap the order
if (blockBelow.getType() == Material.WALL_SIGN || blockBelow.getType() == Material.SIGN_POST) {
String className = ChatColor.stripColor(((Sign) blockBelow.getState()).getLine(0)).toLowerCase();
if (arena.getClasses().containsKey(className)) {
blockSign = blockBehind; // Use blockSign as a temp while swapping
blockBehind = blockBelow;
blockBelow = blockSign;
}
}
// TODO: Make number of searches configurable
// First check the pillar below the sign
Block blockChest = findChestBelow(blockBelow, 6);
@@ -851,6 +862,14 @@ public class ArenaListener
if (blockChest != null) {
InventoryHolder holder = (InventoryHolder) blockChest.getState();
ItemStack[] contents = holder.getInventory().getContents();
// Guard against double-chests for now
if (contents.length > 36) {
ItemStack[] newContents = new ItemStack[36];
for (int i = 0; i < 36; i++) {
newContents[i] = contents[i];
}
contents = newContents;
}
arena.assignClassGiveInv(p, className, contents);
p.getInventory().setContents(contents);
Messenger.tellPlayer(p, Msg.LOBBY_CLASS_PICKED, TextUtils.camelCase(className), arena.getClassLogo(className));