Several fixes and new api for experience merging/stacking (#9242)

1 files changed, 36 insertions, 0 deletions

diff --git a/patches/server/0422-Entity-isTicking.patch b/patches/server/0422-Entity-isTicking.patch
new file mode 100644
index 0000000000..87cfc3f571
--- /dev/null
+++ b/patches/server/0422-Entity-isTicking.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <[email protected]>
+Date: Sat, 3 Oct 2020 21:39:16 -0500
+Subject: [PATCH] Entity#isTicking
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index 240f322b1ae99a73f6b4720d2a03d1a1440cf930..0a51ea55a6b768d71161c4492664a61ec1e5df15 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -4449,5 +4449,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+     public static int nextEntityId() {
+         return ENTITY_COUNTER.incrementAndGet();
+     }
++
++    public boolean isTicking() {
++        return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
++    }
+     // Paper end - Expose entity id counter
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+index 3da47cf8968c1917e2f216a410eece51a693dfb2..2080733ebae1af51b7b4d3cd2fbd1a4a2703a920 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+@@ -1045,4 +1045,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+         return getHandle().isInLava();
+     }
+     // Paper end - entity liquid API
++
++    // Paper start - isTicking API
++    @Override
++    public boolean isTicking() {
++        return getHandle().isTicking();
++    }
++    // Paper end - isTicking API
+ }