Update to Minecraft 1.8.3

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions

View File

@@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/ContainerAnvil.java 2014-11-28 17:43:42.993707437 +0000
+++ src/main/java/net/minecraft/server/ContainerAnvil.java 2014-11-28 17:38:20.000000000 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/ContainerAnvil.java 2015-02-26 22:40:22.375608142 +0000
+++ src/main/java/net/minecraft/server/ContainerAnvil.java 2015-02-26 22:40:22.375608142 +0000
@@ -6,6 +6,8 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -9,21 +9,21 @@
public class ContainerAnvil extends Container {
private static final Logger f = LogManager.getLogger();
@@ -17,8 +19,13 @@
@@ -22,8 +24,13 @@
private int k;
private String l;
private final EntityHuman m;
+ // CraftBukkit start
+ private CraftInventoryView bukkitEntity = null;
+ private PlayerInventory player;
+ // CraftBukkit end
+ // CraftBukkit end
public ContainerAnvil(PlayerInventory playerinventory, World world, BlockPosition blockposition, EntityHuman entityhuman) {
public ContainerAnvil(PlayerInventory playerinventory, final World world, final BlockPosition blockposition, EntityHuman entityhuman) {
+ this.player = playerinventory; // CraftBukkit
this.j = blockposition;
this.i = world;
this.m = entityhuman;
@@ -265,6 +272,7 @@
@@ -317,6 +324,7 @@
}
public boolean a(EntityHuman entityhuman) {
@@ -31,11 +31,11 @@
return this.i.getType(this.j).getBlock() != Blocks.ANVIL ? false : entityhuman.e((double) this.j.getX() + 0.5D, (double) this.j.getY() + 0.5D, (double) this.j.getZ() + 0.5D) <= 64.0D;
}
@@ -328,4 +336,17 @@
static int b(ContainerAnvil containeranvil) {
return containeranvil.k;
@@ -372,4 +380,17 @@
this.e();
}
+
+
+ // CraftBukkit start
+ @Override
+ public CraftInventoryView getBukkitView() {