summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2015-01-05 10:11:50 +1100
committermd_5 <git@md-5.net>2015-01-05 10:11:50 +1100
commit922e0a1a7f55ded3511624de5b385bc4c920662b (patch)
treee35e9f62f7ebeaa3d91b329bc1a2e319eb107ff3 /nms-patches
parentdde25d45ef12b9909279a4944856823c6461320f (diff)
downloadcraftbukkit-922e0a1a7f55ded3511624de5b385bc4c920662b.tar
craftbukkit-922e0a1a7f55ded3511624de5b385bc4c920662b.tar.gz
craftbukkit-922e0a1a7f55ded3511624de5b385bc4c920662b.tar.lz
craftbukkit-922e0a1a7f55ded3511624de5b385bc4c920662b.tar.xz
craftbukkit-922e0a1a7f55ded3511624de5b385bc4c920662b.zip
SPIGOT-341: Backport ender pearl spawning fix from 1.8.1
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/EntityEnderPearl.patch17
1 files changed, 13 insertions, 4 deletions
diff --git a/nms-patches/EntityEnderPearl.patch b/nms-patches/EntityEnderPearl.patch
index b963f4bd..1eeddb3a 100644
--- a/nms-patches/EntityEnderPearl.patch
+++ b/nms-patches/EntityEnderPearl.patch
@@ -1,6 +1,6 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/EntityEnderPearl.java 2014-11-28 17:43:43.085707435 +0000
-+++ src/main/java/net/minecraft/server/EntityEnderPearl.java 2014-11-28 17:38:24.000000000 +0000
-@@ -1,5 +1,11 @@
+--- ../work/decompile-8eb82bde/net/minecraft/server/EntityEnderPearl.java 2015-01-05 10:11:38.333916086 +1100
++++ src/main/java/net/minecraft/server/EntityEnderPearl.java 2015-01-05 10:11:38.333916086 +1100
+@@ -1,7 +1,20 @@
package net.minecraft.server;
+// CraftBukkit start
@@ -11,8 +11,17 @@
+
public class EntityEnderPearl extends EntityProjectile {
++ // CraftBukkit start
++ // This is backported from 1.8.1
++ public EntityEnderPearl(World world) {
++ super(world);
++ }
++ // CraftBukkit end
++
public EntityEnderPearl(World world, EntityLiving entityliving) {
-@@ -29,14 +35,28 @@
+ super(world, entityliving);
+ }
+@@ -29,14 +42,28 @@
entityendermite.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch);
this.world.addEntity(entityendermite);
}