diff options
author | md_5 <git@md-5.net> | 2016-05-10 21:47:39 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-05-10 21:47:39 +1000 |
commit | c5e9a169fa564f3b8119b6666f8df59d5a9b45c3 (patch) | |
tree | 9f3b1ce732f0082b71512b1dddb7abb35526226e /nms-patches/EntityMinecartContainer.patch | |
parent | 4cb32587ac1ff543b2efa9498f8d0d358cb90c12 (diff) | |
download | craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.gz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.lz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.xz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.zip |
Minecraft 1.9.4
Diffstat (limited to 'nms-patches/EntityMinecartContainer.patch')
-rw-r--r-- | nms-patches/EntityMinecartContainer.patch | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/nms-patches/EntityMinecartContainer.patch b/nms-patches/EntityMinecartContainer.patch index afd254cd..452fa392 100644 --- a/nms-patches/EntityMinecartContainer.patch +++ b/nms-patches/EntityMinecartContainer.patch @@ -1,11 +1,12 @@ --- a/net/minecraft/server/EntityMinecartContainer.java +++ b/net/minecraft/server/EntityMinecartContainer.java -@@ -1,14 +1,51 @@ - package net.minecraft.server; +@@ -2,14 +2,57 @@ import java.util.Random; + import javax.annotation.Nullable; +// CraftBukkit start +import java.util.List; ++import org.bukkit.Location; +import org.bukkit.craftbukkit.entity.CraftHumanEntity; +import org.bukkit.entity.HumanEntity; +import org.bukkit.inventory.InventoryHolder; @@ -48,12 +49,17 @@ + public void setMaxStackSize(int size) { + maxStack = size; + } ++ ++ @Override ++ public Location getLocation() { ++ return getBukkitEntity().getLocation(); ++ } + // CraftBukkit end + public EntityMinecartContainer(World world) { super(world); } -@@ -71,7 +108,7 @@ +@@ -75,7 +118,7 @@ } public int getMaxStackSize() { @@ -61,4 +67,4 @@ + return maxStack; // CraftBukkit } - public Entity c(int i) { + @Nullable |