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

1 files changed, 28 insertions, 0 deletions

diff --git a/patches/server/0764-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0764-Remove-unnecessary-onTrackingStart-during-navigation.patch
new file mode 100644
index 0000000000..c764e834e8
--- /dev/null
+++ b/patches/server/0764-Remove-unnecessary-onTrackingStart-during-navigation.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <[email protected]>
+Date: Mon, 3 Oct 2022 20:48:19 +0200
+Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+index 5a1493a981ba99f287fc70193bfdf04f9a01ff89..9f7088691c3ab848c5095b6109d14eae947ace99 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -2216,7 +2216,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+             }
+ 
+             if (entity instanceof Mob entityinsentient) {
+-                if (ServerLevel.this.isUpdatingNavigations) {
++                if (false && ServerLevel.this.isUpdatingNavigations) { // Paper - Remove unnecessary onTrackingStart during navigation warning
+                     String s = "onTrackingStart called during navigation iteration";
+ 
+                     Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration"));
+@@ -2296,7 +2296,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+             }
+ 
+             if (entity instanceof Mob entityinsentient) {
+-                if (ServerLevel.this.isUpdatingNavigations) {
++                if (false && ServerLevel.this.isUpdatingNavigations) { // Paper - Remove unnecessary onTrackingStart during navigation warning
+                     String s = "onTrackingStart called during navigation iteration";
+ 
+                     Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration"));