Skip to content

Commit 5f87fc5

Browse files
committed
small fix
1 parent 82519c1 commit 5f87fc5

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

atdeprecated-server/minecraft-patches/features/0012-Lophine-Add-config-to-enable-Raytracing-tracker.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ index 6868b915bf3deb85783a638d4441a15fea6da2dc..d6b5a6fe6c314edf4faba34af0f42908
2020
double rangeY = level.paperConfig().entities.trackingRangeY.get(this.entity, -1);
2121
if (rangeY != -1) {
2222
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
23-
index dc3d29b7d1590ba366755fef51e4254d901d0da8..90084f1d999adc805e009096d3ca785b22fe8318 100644
23+
index 894897a120123cb54f9dba898748724173c01f57..e4789db560b506d4f03c1f492bfd26e54eaf1984 100644
2424
--- a/net/minecraft/world/entity/Entity.java
2525
+++ b/net/minecraft/world/entity/Entity.java
2626
@@ -147,7 +147,7 @@ import net.minecraft.world.waypoints.WaypointTransmitter;
@@ -32,7 +32,7 @@ index dc3d29b7d1590ba366755fef51e4254d901d0da8..90084f1d999adc805e009096d3ca785b
3232
// CraftBukkit start
3333
private static final int CURRENT_LEVEL = 2;
3434
public boolean preserveMotion = true; // Paper - Fix Entity Teleportation and cancel velocity if teleported; keep initial motion on first snapTo
35-
@@ -6352,4 +6352,47 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
35+
@@ -6365,4 +6365,47 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
3636
// Paper end - Expose entity id counter
3737

3838
public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: MidnightTale <[email protected]>
3+
Date: Sat, 26 Jul 2025 11:46:12 +0700
4+
Subject: [PATCH] Fix: NPE in ChunkMap
5+
6+
7+
diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
8+
index d6b5a6fe6c314edf4faba34af0f42908a8709a00..3cbd03bba9da2b1f3105d4ec997a9af8dc1b5441 100644
9+
--- a/net/minecraft/server/level/ChunkMap.java
10+
+++ b/net/minecraft/server/level/ChunkMap.java
11+
@@ -1023,7 +1023,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
12+
}
13+
((ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerTrackedEntity)tracker).moonrise$tick(nearbyPlayers.getChunk(entity.chunkPosition())); // Folia - region threading
14+
if (((ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerTrackedEntity)tracker).moonrise$hasPlayers()
15+
- || ((ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity)entity).moonrise$getChunkStatus().isOrAfter(FullChunkStatus.ENTITY_TICKING)) {
16+
+ || (java.util.Optional.ofNullable(((ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity)entity).moonrise$getChunkStatus()).orElse(FullChunkStatus.FULL)).isOrAfter(FullChunkStatus.ENTITY_TICKING)) {
17+
tracker.serverEntity.sendChanges();
18+
}
19+
}

0 commit comments

Comments
 (0)