SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-2871: Improve BlockStates + BlockStateMeta

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-12-02 09:29:33 +11:00
parent 159538aaba
commit a00951dd57
16 changed files with 275 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/nms-patches/ContainerEnchantTable.patch
View File

@@ -1,13 +1,12 @@
--- a/net/minecraft/server/ContainerEnchantTable.java
+++ b/net/minecraft/server/ContainerEnchantTable.java
@@ -3,9 +3,22 @@
@@ -3,6 +3,17 @@
import java.util.List;
import java.util.Random;
+// CraftBukkit start
+import java.util.Map;
+import org.bukkit.Location;
+
+import org.bukkit.craftbukkit.inventory.CraftInventoryEnchanting;
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
@@ -18,21 +17,18 @@
+
public class ContainerEnchantTable extends Container {
- public IInventory enchantSlots = new InventorySubcontainer("Enchant", true, 2) {
+ // CraftBukkit - make type specific (changed from IInventory)
+ public InventorySubcontainer enchantSlots = new InventorySubcontainer("Enchant", true, 2) {
public int getMaxStackSize() {
return 64;
}
@@ -14,6 +27,11 @@
public IInventory enchantSlots = new InventorySubcontainer("Enchant", true, 2) {
@@ -14,6 +25,13 @@
super.update();
ContainerEnchantTable.this.a((IInventory) this);
}
+
+ // CraftBukkit start
+ @Override
+ public Location getLocation() {
+ return new org.bukkit.Location(world.getWorld(), position.getX(), position.getY(), position.getZ());
+ }
+ // CraftBukkit end
};
public World world;
private final BlockPosition position;