core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixup patch file

This commit is contained in:
Zach Brown 2017-01-20 09:12:47 -06:00
parent 36078e1a3d
commit 2a16ff905f
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Spigot-Server-Patches/0206-Add-fromBottle-flag-to-Experience-Orbs.patch
View File

@ -1,11 +1,11 @@
From 5bad590913815708415dd55c1b6787b797cd3d5d Mon Sep 17 00:00:00 2001 From 48105c4299692d667f49f32e8c8e54cfe9c5abd7 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 14 Jan 2017 16:15:26 -0600 Date: Sat, 14 Jan 2017 16:15:26 -0600
Subject: [PATCH] Add fromBottle flag to Experience Orbs 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 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 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+++ b/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 { @@ -15,6 +15,14 @@ public class EntityExperienceOrb extends Entity {
@ -37,7 +37,7 @@ index 14431b8a..54c9200a 100644
return false; return false;
} }
diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java 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 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
+++ b/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 { @@ -40,7 +40,7 @@ public class EntityThrownExpBottle extends EntityProjectile {
@ -50,14 +50,15 @@ index 0255986f..28931295 100644
this.die(); this.die();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java 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 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
+++ b/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; getHandle().value = value;
} }
+ // Paper start + // Paper start
+ @Override
+ public boolean isFromBottle() { + public boolean isFromBottle() {
+ return getHandle().isFromBottle(); + return getHandle().isFromBottle();
+ } + }
@ -67,5 +68,5 @@ index 3a09cab3..f992019e 100644
public EntityExperienceOrb getHandle() { public EntityExperienceOrb getHandle() {
return (EntityExperienceOrb) entity; return (EntityExperienceOrb) entity;
-- --
2.11.0 2.9.3