More 1.14 work

This commit is contained in:
Spottedleaf 2019-04-26 23:26:04 -07:00 committed by Zach Brown
parent 36873bf2d6
commit b4b181a1fb
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
73 changed files with 936 additions and 936 deletions

View file

@ -1,4 +1,4 @@
From 59ae19524b32260191e1daaa772623d3c08255d1 Mon Sep 17 00:00:00 2001
From 73882b98ebeec264ffcbd3e0d396e85b9d7dfba0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 16:28:32 -0500
Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
Replaces isFromBottle() with logic that persists entity reloads too.
diff --git a/src/main/java/org/bukkit/entity/ExperienceOrb.java b/src/main/java/org/bukkit/entity/ExperienceOrb.java
index c286edfd..57029d9b 100644
index c286edfd..dec70bbf 100644
--- a/src/main/java/org/bukkit/entity/ExperienceOrb.java
+++ b/src/main/java/org/bukkit/entity/ExperienceOrb.java
@@ -1,5 +1,8 @@
@ -20,7 +20,7 @@ index c286edfd..57029d9b 100644
/**
* Represents an Experience Orb.
*/
@@ -18,4 +21,95 @@ public interface ExperienceOrb extends Entity {
@@ -18,4 +21,99 @@ public interface ExperienceOrb extends Entity {
* @param value Amount of experience
*/
public void setExperience(int value);
@ -78,6 +78,10 @@ index c286edfd..57029d9b 100644
+ */
+ EXP_BOTTLE,
+ /**
+ * Spawned by a player using a grindstone
+ */
+ GRINDSTONE,
+ /**
+ * We do not know why it was spawned
+ */
+ UNKNOWN