From 0c4e92f710eb0e62cf3683ddd34ced7ae75f702e Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Wed, 20 Nov 2013 03:14:21 -0700
Subject: [PATCH] Fix issues with leaving the game with an open inventory not
 properly saving/dropping unused items.

---
 BankEconomyMod/src/me/kaZep/Base/PlayerListener.java      | 4 ++++
 .../src/me/kaZep/Commands/commandBankEconomy.java         | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
index 22b3e9d..1ed220d 100644
--- a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
+++ b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
@@ -9141,6 +9141,7 @@ implements Listener
 	@EventHandler
 	public void onInventoryCloseEvent(InventoryCloseEvent e) {
 		Player p = (Player)e.getPlayer();
+		//Bukkit.getLogger().info("GEt close inventory event.");
 		p.getScoreboard().getTeam(p.getName()).setPrefix(ChatColor.WHITE+"");
 		if (p.hasPermission("group.moderator")) {
 			p.getScoreboard().getTeam(p.getName()).setPrefix(ChatColor.GREEN+"");
@@ -11222,6 +11223,9 @@ implements Listener
 	    if (p.isInsideVehicle()) {
    		 	p.leaveVehicle();
   		  }
+	    if (p.getOpenInventory()!=null) {
+	    	p.closeInventory();
+	    }
 		for (int i=0;i<this.plugin.SPEED_CONTROL.size();i++) {
 			if (this.plugin.SPEED_CONTROL.get(i).p.getName().compareTo(p.getName())==0) {
 				p.removePotionEffect(PotionEffectType.SPEED);
diff --git a/BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java b/BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java
index fa63544..b140a6b 100644
--- a/BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java
+++ b/BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java
@@ -1122,7 +1122,7 @@ public String convertToItemName(String val) {
 					    } else {
 					    	Bukkit.getLogger().warning(("File does not exist."));
 					    }
-					    this.plugin.last_boss_dungeon_time=Bukkit.getWorld("world").getFullTime()+12000;
+					    this.plugin.last_boss_dungeon_time=this.plugin.SERVER_TICK_TIME+12000;
 				  }
 			  if (args[0].equalsIgnoreCase("fatal_survivor") && args[1].equalsIgnoreCase("reset")) {
 				  boolean survivor=false;
@@ -1778,7 +1778,7 @@ public String convertToItemName(String val) {
     					  for (int j=0;j<this.plugin.explorers.size();j++) {
     						  if (this.plugin.explorers.get(j).name.compareToIgnoreCase(p.getName())==0 && this.plugin.explorers.get(j).event==0) {
     							  discovered=true;
-    							  timeleft=this.plugin.explorers.get(j).expiretime-Bukkit.getWorld("world").getFullTime();
+    							  timeleft=this.plugin.explorers.get(j).expiretime-this.plugin.SERVER_TICK_TIME;
     						  }
     					  }
     					  //Add-on message for explorer buff cooldown.
@@ -1812,7 +1812,7 @@ public String convertToItemName(String val) {
 	    					  for (int j=0;j<this.plugin.explorers.size();j++) {
 	    						  if (this.plugin.explorers.get(j).name.compareToIgnoreCase(Bukkit.getPlayer(args[1]).getName())==0 && this.plugin.explorers.get(j).event==0) {
 	    							  discovered=true;
-	    							  timeleft=this.plugin.explorers.get(j).expiretime-Bukkit.getWorld("world").getFullTime();
+	    							  timeleft=this.plugin.explorers.get(j).expiretime-this.plugin.SERVER_TICK_TIME;
 	    						  }
 	    					  }
 	    					  //Add-on message for explorer buff cooldown.
@@ -1847,7 +1847,7 @@ public String convertToItemName(String val) {
 	    					  for (int j=0;j<this.plugin.explorers.size();j++) {
 	    						  if (this.plugin.explorers.get(j).name.compareToIgnoreCase(q.getName())==0 && this.plugin.explorers.get(j).event==0) {
 	    							  discovered=true;
-	    							  timeleft=this.plugin.explorers.get(j).expiretime-Bukkit.getWorld("world").getFullTime();
+	    							  timeleft=this.plugin.explorers.get(j).expiretime-this.plugin.SERVER_TICK_TIME;
 	    						  }
 	    					  }
 	    					  //Add-on message for explorer buff cooldown.