New RB #670

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1149 e251c2fe-e539-e718-e476-b85c1f46cddb

5 files changed, 86 insertions, 6 deletions

diff --git a/Essentials/src/com/earth2me/essentials/InventoryWorkaround.java b/Essentials/src/com/earth2me/essentials/InventoryWorkaround.java
index aabd7b02b..fc207f5de 100644
--- a/Essentials/src/com/earth2me/essentials/InventoryWorkaround.java
+++ b/Essentials/src/com/earth2me/essentials/InventoryWorkaround.java
@@ -17,9 +17,9 @@ public class InventoryWorkaround {
 	}
 
 	public static int next(CraftInventory ci, ItemStack item, int start, boolean forceDurability, boolean forceAmount) {
-		CraftItemStack[] inventory = ci.getContents();
+		ItemStack[] inventory = ci.getContents();
 		for (int i = start; i < inventory.length; i++) {
-			CraftItemStack cItem = inventory[i];
+			ItemStack cItem = inventory[i];
 			if (item.getTypeId() == cItem.getTypeId() && (!forceAmount || item.getAmount() == cItem.getAmount()) && (!forceDurability || cItem.getDurability() == item.getDurability())) {
 				return i;
 			}
@@ -55,7 +55,7 @@ public class InventoryWorkaround {
 					leftover.put(i, item);
 					break;
 				} else {
-					CraftItemStack itemStack = ci.getItem(first);
+					ItemStack itemStack = ci.getItem(first);
 					int amount = itemStack.getAmount();
 
 					if (amount <= toDelete) {
@@ -119,7 +119,7 @@ public class InventoryWorkaround {
 					leftover.put(i, item);
 					break;
 				} else {
-					CraftItemStack itemStack = ci.getItem(slot);
+					ItemStack itemStack = ci.getItem(slot);
 					int amount = itemStack.getAmount();
 
 					if (amount <= mustHave) {
diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
index 5fffdfa99..3030e5f19 100644
--- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
+++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
@@ -348,4 +348,44 @@ public class OfflinePlayer implements Player
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
+
+	public void saveData()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void loadData()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean isSleeping()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public int getSleepTicks()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public List<Entity> getNearbyEntities(double d, double d1, double d2)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean isDead()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public float getFallDistance()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void setFallDistance(float f)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/PlayerWrapper.java b/Essentials/src/com/earth2me/essentials/PlayerWrapper.java
index 0de6f669e..ea21ad2b7 100644
--- a/Essentials/src/com/earth2me/essentials/PlayerWrapper.java
+++ b/Essentials/src/com/earth2me/essentials/PlayerWrapper.java
@@ -413,4 +413,44 @@ public class PlayerWrapper implements Player
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
+
+	public void saveData()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void loadData()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean isSleeping()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public int getSleepTicks()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public List<Entity> getNearbyEntities(double d, double d1, double d2)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public boolean isDead()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public float getFallDistance()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	public void setFallDistance(float f)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
 }
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index b4c1fb452..f1641406d 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -33,7 +33,7 @@ public class User extends PlayerExtension implements Comparable<User>, IReplyTo
 	private CommandSender replyTo = null;
 	private boolean isNew = false;
 	public String currentJail;
-	public CraftItemStack[] savedInventory;
+	public ItemStack[] savedInventory;
 
 	private User(Player base)
 	{
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java b/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java
index 2e7ec407a..4f94c0935 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandinvsee.java
@@ -30,7 +30,7 @@ public class Commandinvsee extends EssentialsCommand {
 		
 		user.charge(this);
 		if (user.savedInventory == null) {
-			user.savedInventory = ((CraftInventory)user.getInventory()).getContents();
+			user.savedInventory = user.getInventory().getContents();
 		}
 		((CraftInventory)user.getInventory()).setContents(((CraftInventory)invUser.getInventory()).getContents());
 		user.sendMessage("You see the inventory of "+invUser.getDisplayName()+".");