sigonasr2/TwosideKeeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Item Cube History

Browse Source
This commit is contained in:
sigonasr2 2016-09-02 00:34:18 -05:00
parent 1e80ec53b3
commit b649c9cd43
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

9
src/sig/plugin/TwosideKeeper/ItemCubeWindow.java
View File

@ -36,16 +36,15 @@ public class ItemCubeWindow {
Inventory temp = Bukkit.getServer().createInventory(p, inv_size, "Item Cube #"+itemcubeid); Inventory temp = Bukkit.getServer().createInventory(p, inv_size, "Item Cube #"+itemcubeid);
pd.opened_another_cube=true; pd.opened_another_cube=true;
TwosideKeeper.openItemCubeInventory(temp); TwosideKeeper.openItemCubeInventory(temp);
@SuppressWarnings("unused") Bukkit.getScheduler().scheduleSyncDelayedTask(TwosideKeeper.plugin, new Runnable() {@Override public void run() {InventoryView newinv = p.openInventory(temp);
InventoryView newinv = p.openInventory(temp);
pd.opened_another_cube=false; pd.opened_another_cube=false;
pd.isViewingItemCube=true; pd.isViewingItemCube=true;}},1);
p.playSound(p.getLocation(),Sound.BLOCK_CHEST_OPEN,1.0f,1.0f); p.playSound(p.getLocation(),Sound.BLOCK_CHEST_OPEN,1.0f,1.0f);
} else { } else {
pd.opened_another_cube=true; pd.opened_another_cube=true;
p.openInventory(ItemCube.getViewingItemCubeInventory(itemcubeid, p)); Bukkit.getScheduler().scheduleSyncDelayedTask(TwosideKeeper.plugin, new Runnable() {@Override public void run() {p.openInventory(ItemCube.getViewingItemCubeInventory(itemcubeid, p));
pd.opened_another_cube=false; pd.opened_another_cube=false;
pd.isViewingItemCube=true; pd.isViewingItemCube=true;}},1);
p.playSound(p.getLocation(), Sound.BLOCK_CHEST_OPEN, 1.0f, 1.0f); p.playSound(p.getLocation(), Sound.BLOCK_CHEST_OPEN, 1.0f, 1.0f);
} }
}},1); }},1);

27
src/sig/plugin/TwosideKeeper/TwosideKeeper.java
View File

@ -3580,7 +3580,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
public void run() { public void run() {
setPlayerMaxHealth(player); setPlayerMaxHealth(player);
} }
},5); },1);
} }
if (DeathManager.deathStructureExists(player) && ev.getInventory().getTitle().equalsIgnoreCase("Death Loot")) { if (DeathManager.deathStructureExists(player) && ev.getInventory().getTitle().equalsIgnoreCase("Death Loot")) {
@ -3604,7 +3604,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
public void run() { public void run() {
player.sendMessage(ChatColor.BLUE+"New Balance: "+ChatColor.GREEN+"$"+df.format((getPlayerMoney(player)+getPlayerBankMoney(player)-DeathManager.CalculateDeathPrice(player)*DeathManager.CountOccupiedSlots(player.getInventory())))); player.sendMessage(ChatColor.BLUE+"New Balance: "+ChatColor.GREEN+"$"+df.format((getPlayerMoney(player)+getPlayerBankMoney(player)-DeathManager.CalculateDeathPrice(player)*DeathManager.CountOccupiedSlots(player.getInventory()))));
} }
},5); },1);
} }
} else { } else {
player.sendMessage(ChatColor.RED+"You cannot afford to salvage any more items!"); player.sendMessage(ChatColor.RED+"You cannot afford to salvage any more items!");
@ -3623,7 +3623,8 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
if (playerHasArrowQuiver(p)) { if (playerHasArrowQuiver(p)) {
boolean foundquiver=false; boolean foundquiver=false;
int slot=-1; int slot=-1;
if (ev.getSlot()>=0 && p.getInventory().getItem(ev.getSlot())!=null && if (ev.getSlot()>=0 && p.getInventory().getSize()>ev.getSlot()-1 &&
p.getInventory().getItem(ev.getSlot())!=null &&
p.getInventory().getItem(ev.getSlot()).getType()==Material.TIPPED_ARROW && p.getInventory().getItem(ev.getSlot()).getType()==Material.TIPPED_ARROW &&
p.getInventory().getItem(ev.getSlot()).getEnchantmentLevel(Enchantment.ARROW_INFINITE)==5) { p.getInventory().getItem(ev.getSlot()).getEnchantmentLevel(Enchantment.ARROW_INFINITE)==5) {
//This is an arrow quiver. //This is an arrow quiver.
@ -3655,7 +3656,8 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
if (playerHasArrowQuiver(p)) { if (playerHasArrowQuiver(p)) {
boolean foundquiver=false; boolean foundquiver=false;
int slot=-1; int slot=-1;
if (ev.getSlot()>=0 && p.getInventory().getItem(ev.getSlot())!=null && if (ev.getSlot()>=0 && p.getInventory().getSize()>ev.getSlot()-1 &&
p.getInventory().getItem(ev.getSlot())!=null &&
p.getInventory().getItem(ev.getSlot()).getType()==Material.TIPPED_ARROW && p.getInventory().getItem(ev.getSlot()).getType()==Material.TIPPED_ARROW &&
p.getInventory().getItem(ev.getSlot()).getEnchantmentLevel(Enchantment.ARROW_INFINITE)==5) { p.getInventory().getItem(ev.getSlot()).getEnchantmentLevel(Enchantment.ARROW_INFINITE)==5) {
//This is an arrow quiver. //This is an arrow quiver.
@ -3917,28 +3919,29 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
} else { } else {
inventory_size=27; inventory_size=27;
} }
final PlayerStructure pd2 = pd;
if (!ItemCube.isSomeoneViewingItemCube(idnumb,p)) { if (!ItemCube.isSomeoneViewingItemCube(idnumb,p)) {
log("Attempting to open",5); log("Attempting to open",5);
ev.setCancelled(true); //ev.setCancelled(true);
ev.setResult(Result.DENY); ev.setResult(Result.DENY);
//pd.itemcubeviews.add(p.getOpenInventory()); //pd.itemcubeviews.add(p.getOpenInventory());
pd.opened_another_cube=true; pd.opened_another_cube=true;
Inventory temp = Bukkit.getServer().createInventory(p, inventory_size, "Item Cube #"+idnumb); Inventory temp = Bukkit.getServer().createInventory(p, inventory_size, "Item Cube #"+idnumb);
openItemCubeInventory(temp); openItemCubeInventory(temp);
p.openInventory(temp); Bukkit.getScheduler().scheduleSyncDelayedTask(this, new Runnable() {@Override public void run() {p.openInventory(temp);
pd.opened_another_cube=false; pd2.opened_another_cube=false;
pd.isViewingItemCube=true; pd2.isViewingItemCube=true;}},1);
p.playSound(p.getLocation(),Sound.BLOCK_CHEST_OPEN,1.0f,1.0f); p.playSound(p.getLocation(),Sound.BLOCK_CHEST_OPEN,1.0f,1.0f);
return; return;
} else { } else {
ev.setCancelled(true); //ev.setCancelled(true);
ev.setResult(Result.DENY); ev.setResult(Result.DENY);
//ItemCube.displayErrorMessage(p); //ItemCube.displayErrorMessage(p);
//pd.itemcubeviews.add(p.getOpenInventory()); //pd.itemcubeviews.add(p.getOpenInventory());
pd.opened_another_cube=true; pd.opened_another_cube=true;
p.openInventory(ItemCube.getViewingItemCubeInventory(idnumb, p)); Bukkit.getScheduler().scheduleSyncDelayedTask(this, new Runnable() {@Override public void run() {p.openInventory(ItemCube.getViewingItemCubeInventory(idnumb, p));
pd.isViewingItemCube=true; pd2.opened_another_cube=false;
pd.opened_another_cube=false; pd2.isViewingItemCube=true;}},1);
p.playSound(p.getLocation(), Sound.BLOCK_CHEST_OPEN, 1.0f, 1.0f); p.playSound(p.getLocation(), Sound.BLOCK_CHEST_OPEN, 1.0f, 1.0f);
return; return;
} }