From 93271dfe39862596583e7bf8cf160f7c37ae8d96 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Thu, 24 Oct 2024 12:47:34 -0700
Subject: [PATCH] Finish mixin diff review

The mixin diff review looks OK, but need to check the
patch diff now.
---
 moonrise_update_1_21_2.txt                         |  7 ++-----
 patches/server/Moonrise-optimisation-patches.patch | 12 +++++++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/moonrise_update_1_21_2.txt b/moonrise_update_1_21_2.txt
index 3ecdcaf3b3..27f8176a6e 100644
--- a/moonrise_update_1_21_2.txt
+++ b/moonrise_update_1_21_2.txt
@@ -1,7 +1,4 @@
-reference comparison:
-https://github.com/Tuinity/Moonrise/compare/6a2c6d27df11d417c1fefa749109d8e87599e8c2...f22335f0b65e205831c74a7b4b8f4d93fff54fd5
-
-
 todo:
-- need to compare the diffs
+- need to compare the patch diff for moonrise
 - in ChunkEntitySlices, implement modifySavedEntities() by copying from old
+- port poi_lookup?
diff --git a/patches/server/Moonrise-optimisation-patches.patch b/patches/server/Moonrise-optimisation-patches.patch
index 3561cf8337..a8d0a708f7 100644
--- a/patches/server/Moonrise-optimisation-patches.patch
+++ b/patches/server/Moonrise-optimisation-patches.patch
@@ -23878,6 +23878,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      }
  
+     public boolean blockChanged(BlockPos pos) {
+-        LevelChunk chunk = this.getTickingChunk();
++        LevelChunk chunk = this.playersSentChunkTo.size() == 0 ? null : this.getChunkToSend(); // Paper - rewrite chunk system
+ 
+         if (chunk == null) {
+             return false;
 @@ -0,0 +0,0 @@ public class ChunkHolder extends GenerationChunkHolder {
              return false;
          } else {
@@ -31032,7 +31038,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      };
      protected final O owner;
 -    private final Reference2ObjectArrayMap<Property<?>, Comparable<?>> values;
-+    private Reference2ObjectArrayMap<Property<?>, Comparable<?>> values;  // Paper - optimise blockstate property access - remove final
++    private Reference2ObjectArrayMap<Property<?>, Comparable<?>> values; // Paper - optimise blockstate property access - remove final
      private Map<Property<?>, S[]> neighbours;
      protected final MapCodec<S> propertiesCodec;
  
@@ -31889,8 +31895,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    private final ca.spottedleaf.moonrise.common.list.ShortList tickingBlocks = new ca.spottedleaf.moonrise.common.list.ShortList();
 +
 +    @Override
-+    public final int moonrise$getSpecialCollidingBlocks() {
-+        return this.specialCollidingBlocks;
++    public final boolean moonrise$hasSpecialCollidingBlocks() {
++        return this.specialCollidingBlocks != 0;
 +    }
 +
 +    @Override