Updated Upstream (Paper) (#300)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
ef60c01c4 [Auto] Updated Upstream (CraftBukkit)
0256dbea3 [Auto] Updated Upstream (Bukkit/CraftBukkit)
91ef74029 Updated Upstream (Spigot) (#5550)
fdf2a59d5 Updated Upstream (Bukkit/CraftBukkit) (#5549)
This commit is contained in:
giovanniwijaya
2021-04-30 01:58:16 +08:00
committed by GitHub
parent 79c82d2a22
commit 1389b02fe9
5 changed files with 11 additions and 11 deletions

View File

@@ -50,7 +50,7 @@ index 5f2d5e12f11b471662943680b2012c99a8466306..7395fe0261da696d1b16c845d244ad5d
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index c51d545e137eec2017c9f2ff944db70f2fdffdfc..1e25f387e053b648477a3e9dace1a6c95e7f8cba 100644
index b47e31d2b9b41b39b46892fe10bf36d82c5d8e1b..7fa5242bd44c9b19648d79fa8fecbb7ee125288e 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -751,5 +751,24 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent