Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-11-14 06:17:01 +01:00
Code Issues Projects Releases Wiki Activity

Closes gh-22. Warzone-specific loadouts never worked, until now. Oops, sorry.

Browse Source
This commit is contained in:
taoneill 2011-02-06 00:35:20 -05:00
parent c68f864be9
commit 1ec9f0178c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
war/src/main/java/com/tommytony/war/Warzone.java
View File

@ -33,7 +33,7 @@ public class Warzone {
private Location teleport;
private boolean friendlyFire;
private int lifePool;
private HashMap<Integer, ItemStack> loadout;
private HashMap<Integer, ItemStack> loadout = new HashMap<Integer, ItemStack>();
private boolean drawZoneOutline;
private int teamCap = 5;
private int scoreCap = 5;
@ -386,7 +386,7 @@ public class Warzone {
} else if(slot == 103) {
playerInv.setHelmet(loadout.get(slot));
} else {
playerInv.setItem(slot, loadout.get(slot));
playerInv.addItem(loadout.get(slot));
}
}
if(isBlockHeads()) {
@ -444,8 +444,12 @@ public class Warzone {
return this.friendlyFire;
}
public void setLoadout(HashMap<Integer, ItemStack> loadout) {
this.loadout = loadout;
public void setLoadout(HashMap<Integer, ItemStack> newLoadout) {
this.loadout.clear();
for(Integer slot : newLoadout.keySet()) {
ItemStack stack = newLoadout.get(slot);
this.loadout.put(slot, stack);
}
}
public HashMap<Integer, ItemStack> getLoadout() {