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

Brought back inventory code.

Browse Source
This commit is contained in:
taoneill 2011-01-10 01:21:04 -05:00
parent 631ff256c1
commit 9f53f0265e
3 changed files with 47 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
war/src/main/java/com/tommytony/war/WarBlockListener.java
View File

@ -5,8 +5,8 @@ import java.util.List;
import org.bukkit.Block;
import org.bukkit.Material;
import org.bukkit.Player;
import org.bukkit.event.block.BlockBrokenEvent;
import org.bukkit.event.block.BlockCanBuildEvent;
import org.bukkit.event.block.BlockDamagedEvent;
import org.bukkit.event.block.BlockFromToEvent;
import org.bukkit.event.block.BlockIgniteEvent;
import org.bukkit.event.block.BlockListener;
@ -45,7 +45,7 @@ public class WarBlockListener extends BlockListener {
}
public void onBlockBroken(BlockBrokenEvent event) {
public void onBlockDamaged(BlockDamagedEvent event) {
Player player = event.getPlayer();
Block block = event.getBlock();
if(player != null && block != null) {

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

@ -8,6 +8,7 @@ import org.bukkit.ItemStack;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Player;
import org.bukkit.PlayerInventory;
import org.bukkit.World;
import org.bukkit.block.BlockState;
import org.bukkit.block.Sign;
@ -29,7 +30,7 @@ public class Warzone {
private int lifePool;
private HashMap<Integer, ItemStack> loadout;
private HashMap<String, HashMap<Integer, ItemStack>> inventories = new HashMap<String, HashMap<Integer, ItemStack>>();
private HashMap<String, List<ItemStack>> inventories = new HashMap<String, List<ItemStack>>();
private World world;
public Warzone(War war, World world, String name) {
@ -208,18 +209,16 @@ public class Warzone {
}
public void respawnPlayer(Team team, Player player) {
// BUKKIT
// Inventory playerInv = player.getInventory();
// playerInv.getContents().clear();
// for(Integer slot : loadout.keySet()) {
// playerInv.getContents().add(loadout.get(slot));
// // TODO set the proper slot index
// }
// Reset inventory to loadout
PlayerInventory playerInv = player.getInventory();
for(int i = 0; i < playerInv.getSize(); i++){
playerInv.setItem(i, new ItemStack(Material.Air));
}
for(Integer slot : loadout.keySet()) {
playerInv.setItem(slot, loadout.get(slot));
}
player.setHealth(20);
// BUKKIT
// player.setFireTicks(0);
player.teleportTo(team.getTeamSpawn());
}
@ -256,23 +255,11 @@ public class Warzone {
return false;
}
// public void removeSpawnArea(Team team) {
// // Reset spawn to what it was before the gold blocks
// team.getVolume().resetBlocks();
// }
// public void addSpawnArea(Team team, Location location) {
// // Save the spawn state
// team.setTeamSpawn(location);
// }
public List<Monument> getMonuments() {
return monuments;
}
public boolean getFriendlyFire() {
// TODO Auto-generated method stub
return this.friendlyFire;
}
@ -301,26 +288,26 @@ public class Warzone {
}
public void keepPlayerInventory(Player player) {
// BUKKIT
// Inventory inventory = player.getInventory();
//
// inventories.put(player.getName(), inventory.getContents());
PlayerInventory inventory = player.getInventory();
List<ItemStack> invToStore = new ArrayList<ItemStack>();
for(int i=0; i < inventory.getSize(); i++) {
invToStore.set(i, inventory.getItem(i));
}
inventories.put(player.getName(), invToStore);
}
public void restorePlayerInventory(Player player) {
// HashMap<Integer,ItemStack> originalContents = inventories.remove((player.getName());
// Inventory playerInv = player.getInventory();
// playerInv.clearContents();
// playerInv.update();
// for(Item item : originalContents) {
// playerInv.addItem(item);
// }
// playerInv.update();
// player.getInventory().update();
List<ItemStack> originalContents = inventories.remove(player.getName());
PlayerInventory playerInv = player.getInventory();
for(int i = 0; i < playerInv.getSize(); i++) {
playerInv.setItem(i, new ItemStack(Material.Air));
}
for(int i = 0; i < playerInv.getSize(); i++) {
playerInv.setItem(i, originalContents.get(i));
}
}
public boolean hasMonument(String monumentName) {
boolean hasIt = false;
for(Monument monument: monuments) {
if(monument.getName().equals(monumentName)) {
return true;
@ -330,7 +317,6 @@ public class Warzone {
}
public Monument getMonument(String monumentName) {
boolean hasIt = false;
for(Monument monument: monuments) {
if(monument.getName().equals(monumentName)) {
return monument;

38
war/src/main/java/com/tommytony/war/mappers/WarMapper.java
View File

@ -1,6 +1,9 @@
package com.tommytony.war.mappers;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import org.bukkit.ItemStack;
import com.tommytony.war.War;
import com.tommytony.war.Warzone;
@ -46,17 +49,17 @@ public class WarMapper {
}
// defaultLoadout
// String defaultLoadoutStr = warConfig.getString("defaultLoadout");
// String[] defaultLoadoutSplit = defaultLoadoutStr.split(";");
// war.getDefaultLoadout().clear();
// for(String itemStr : defaultLoadoutSplit) {
// if(itemStr != null && !itemStr.equals("")) {
// String[] itemStrSplit = itemStr.split(",");
// ItemStack item = new ItemStack(Integer.parseInt(itemStrSplit[0]),
// Integer.parseInt(itemStrSplit[1]));
// war.getDefaultLoadout().add(item);
// }
// }
String defaultLoadoutStr = warConfig.getString("defaultLoadout");
String[] defaultLoadoutSplit = defaultLoadoutStr.split(";");
war.getDefaultLoadout().clear();
for(String itemStr : defaultLoadoutSplit) {
if(itemStr != null && !itemStr.equals("")) {
String[] itemStrSplit = itemStr.split(",");
ItemStack item = new ItemStack(Integer.parseInt(itemStrSplit[0]),
Integer.parseInt(itemStrSplit[1]));
war.getDefaultLoadout().put(Integer.parseInt(itemStrSplit[2]), item);
}
}
// defaultLifePool
war.setDefaultLifepool(warConfig.getInt("defaultLifePool"));
@ -80,12 +83,13 @@ public class WarMapper {
warConfig.setString("warzones", warzonesStr);
// defaultLoadout
// String defaultLoadoutStr = "";
// List<Item> items = war.getDefaultLoadout();
// for(Item item : items) {
// defaultLoadoutStr += item.getItemId() + "," + item.getAmount() + "," + item.getSlot() + ";";
// }
// warConfig.setString("defaultLoadout", defaultLoadoutStr);
String defaultLoadoutStr = "";
HashMap<Integer, ItemStack> items = war.getDefaultLoadout();
for(Integer slot : items.keySet()) {
ItemStack item = items.get(slot);
defaultLoadoutStr += item.getTypeID() + "," + item.getAmount() + "," + slot + ";";
}
warConfig.setString("defaultLoadout", defaultLoadoutStr);
// defaultLifepool
warConfig.setInt("defaultLifePool", war.getDefaultLifepool());