Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
5234e6e2 Entity#isTicking (#4612)
This commit is contained in:
William Blake Galbreath
2020-10-04 00:44:32 -05:00
parent a16a79c6d8
commit 4984bb71e0
4 changed files with 13 additions and 13 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Ridables
diff --git a/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
new file mode 100644
index 00000000..c0ec5a13
index 000000000..c0ec5a130
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
@@ -0,0 +1,37 @@
@@ -48,12 +48,12 @@ index 00000000..c0ec5a13
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index cb9ef706..9c418528 100644
index 9bae4704b..b4771d8e5 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -691,4 +691,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -696,4 +696,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
public boolean isInLava();
public boolean isTicking();
// Paper end
+
+ // Purpur start