From 2a16ff905f1cd19140a39bbb7720faff12fa5667 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 20 Jan 2017 09:12:47 -0600 Subject: [PATCH] Fixup patch file --- ...Add-fromBottle-flag-to-Experience-Orbs.patch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Spigot-Server-Patches/0206-Add-fromBottle-flag-to-Experience-Orbs.patch b/Spigot-Server-Patches/0206-Add-fromBottle-flag-to-Experience-Orbs.patch index 187bf80cb..0c1dbbcec 100644 --- a/Spigot-Server-Patches/0206-Add-fromBottle-flag-to-Experience-Orbs.patch +++ b/Spigot-Server-Patches/0206-Add-fromBottle-flag-to-Experience-Orbs.patch @@ -1,11 +1,11 @@ -From 5bad590913815708415dd55c1b6787b797cd3d5d Mon Sep 17 00:00:00 2001 +From 48105c4299692d667f49f32e8c8e54cfe9c5abd7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 14 Jan 2017 16:15:26 -0600 Subject: [PATCH] Add fromBottle flag to Experience Orbs diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 14431b8a..54c9200a 100644 +index 14431b8..54c9200 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -15,6 +15,14 @@ public class EntityExperienceOrb extends Entity { @@ -37,7 +37,7 @@ index 14431b8a..54c9200a 100644 return false; } diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java -index 0255986f..28931295 100644 +index 0255986..2893129 100644 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java @@ -40,7 +40,7 @@ public class EntityThrownExpBottle extends EntityProjectile { @@ -50,14 +50,15 @@ index 0255986f..28931295 100644 this.die(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java -index 3a09cab3..f992019e 100644 +index 3a09cab..61e3c6c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java -@@ -18,6 +18,10 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb { +@@ -18,6 +18,13 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb { getHandle().value = value; } - -+ // Paper start + ++ // Paper start ++ @Override + public boolean isFromBottle() { + return getHandle().isFromBottle(); + } @@ -67,5 +68,5 @@ index 3a09cab3..f992019e 100644 public EntityExperienceOrb getHandle() { return (EntityExperienceOrb) entity; -- -2.11.0 +2.9.3