summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-11-30 22:59:50 +0100
committersnowleo <schneeleo@gmail.com>2011-11-30 22:59:50 +0100
commit3c9f0db3d49b314dcd6ac2005205940e805b3e0b (patch)
treefa017e6e0049b485656d1c1837ec9ba6b21f95fc
parentbd7bd86e628146899eeb24884029e43b41354c93 (diff)
downloadEssentials-3c9f0db3d49b314dcd6ac2005205940e805b3e0b.tar
Essentials-3c9f0db3d49b314dcd6ac2005205940e805b3e0b.tar.gz
Essentials-3c9f0db3d49b314dcd6ac2005205940e805b3e0b.tar.lz
Essentials-3c9f0db3d49b314dcd6ac2005205940e805b3e0b.tar.xz
Essentials-3c9f0db3d49b314dcd6ac2005205940e805b3e0b.zip
CB#1534 B#1048
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/craftbukkit/ShowInventory.java6
-rw-r--r--lib/bukkit-1.0.0-R1-SNAPSHOT.jarbin4396774 -> 4398060 bytes
-rw-r--r--lib/craftbukkit-1.0.0-SNAPSHOT.jarbin9782936 -> 9793971 bytes
4 files changed, 4 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 575bc6c7d..80fbd7265 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -61,7 +61,7 @@ import org.yaml.snakeyaml.error.YAMLException;
public class Essentials extends JavaPlugin implements IEssentials
{
- public static final int BUKKIT_VERSION = 1526;
+ public static final int BUKKIT_VERSION = 1534;
private static final Logger LOGGER = Logger.getLogger("Minecraft");
private transient ISettings settings;
private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this);
diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/ShowInventory.java b/Essentials/src/com/earth2me/essentials/craftbukkit/ShowInventory.java
index f77b20208..9d6bffcd1 100644
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/ShowInventory.java
+++ b/Essentials/src/com/earth2me/essentials/craftbukkit/ShowInventory.java
@@ -5,7 +5,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import net.minecraft.server.EntityPlayer;
import net.minecraft.server.IInventory;
-import net.minecraft.server.InventoryPlayer;
+import net.minecraft.server.PlayerInventory;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
import org.bukkit.entity.Player;
@@ -19,7 +19,7 @@ public class ShowInventory
try
{
final EntityPlayer entityPlayer = ((CraftPlayer)player).getHandle();
- final CraftInventoryPlayer inv = new CraftInventoryPlayer(new InventoryPlayer(((CraftPlayer)player).getHandle()));
+ final CraftInventoryPlayer inv = new CraftInventoryPlayer(new PlayerInventory(((CraftPlayer)player).getHandle()));
inv.clear();
entityPlayer.a((IInventory)inv.getInventory());
}
@@ -34,7 +34,7 @@ public class ShowInventory
try
{
final EntityPlayer entityPlayer = ((CraftPlayer)player).getHandle();
- final CraftInventoryPlayer inv = new CraftInventoryPlayer(new InventoryPlayer(((CraftPlayer)player).getHandle()));
+ final CraftInventoryPlayer inv = new CraftInventoryPlayer(new PlayerInventory(((CraftPlayer)player).getHandle()));
inv.clear();
InventoryWorkaround.addItem(inv, true, stack);
entityPlayer.a((IInventory)inv.getInventory());
diff --git a/lib/bukkit-1.0.0-R1-SNAPSHOT.jar b/lib/bukkit-1.0.0-R1-SNAPSHOT.jar
index 259ebadfd..06ce13fd1 100644
--- a/lib/bukkit-1.0.0-R1-SNAPSHOT.jar
+++ b/lib/bukkit-1.0.0-R1-SNAPSHOT.jar
Binary files differ
diff --git a/lib/craftbukkit-1.0.0-SNAPSHOT.jar b/lib/craftbukkit-1.0.0-SNAPSHOT.jar
index 0bd508b04..57fb85990 100644
--- a/lib/craftbukkit-1.0.0-SNAPSHOT.jar
+++ b/lib/craftbukkit-1.0.0-SNAPSHOT.jar
Binary files differ