Update to Minecraft 1.9

This commit is contained in:
md_5
2016-03-01 08:32:46 +11:00
parent e1ebe524a7
commit aa008dff0f
305 changed files with 6684 additions and 6105 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/ContainerBrewingStand.java
+++ b/net/minecraft/server/ContainerBrewingStand.java
@@ -1,12 +1,23 @@
@@ -1,5 +1,10 @@
package net.minecraft.server;
+// CraftBukkit start
@@ -11,8 +11,9 @@
public class ContainerBrewingStand extends Container {
private IInventory brewingStand;
private final Slot f;
@@ -7,7 +12,13 @@
private int g;
private int h;
+ // CraftBukkit start
+ private CraftInventoryView bukkitEntity = null;
@@ -22,9 +23,9 @@
public ContainerBrewingStand(PlayerInventory playerinventory, IInventory iinventory) {
+ player = playerinventory; // CraftBukkit
this.brewingStand = iinventory;
this.a((Slot) (new ContainerBrewingStand.SlotPotionBottle(playerinventory.player, iinventory, 0, 56, 46)));
this.a((Slot) (new ContainerBrewingStand.SlotPotionBottle(playerinventory.player, iinventory, 1, 79, 53)));
@@ -47,6 +58,7 @@
this.a((Slot) (new ContainerBrewingStand.SlotPotionBottle(playerinventory.player, iinventory, 0, 56, 51)));
this.a((Slot) (new ContainerBrewingStand.SlotPotionBottle(playerinventory.player, iinventory, 1, 79, 58)));
@@ -54,6 +65,7 @@
}
public boolean a(EntityHuman entityhuman) {
@@ -32,8 +33,8 @@
return this.brewingStand.a(entityhuman);
}
@@ -146,4 +158,17 @@
return itemstack != null && (itemstack.getItem() == Items.POTION || itemstack.getItem() == Items.GLASS_BOTTLE);
@@ -182,4 +194,17 @@
}
}
}
+