diff options
| author | Jason Penilla <[email protected]> | 2024-06-18 18:27:50 -0700 |
|---|---|---|
| committer | Jason Penilla <[email protected]> | 2024-06-18 18:27:50 -0700 |
| commit | d23825aa56dbe22140b4191e41ae4cf8f7188ebd (patch) | |
| tree | 4b393a4ecb27bd814463b23b8e6b6a40989b0cc8 /patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch | |
| parent | 126f6d7dc164ff12a2257c14780a72341a96f2f8 (diff) | |
| download | Paper-d23825aa56dbe22140b4191e41ae4cf8f7188ebd.tar.gz Paper-d23825aa56dbe22140b4191e41ae4cf8f7188ebd.zip | |
Add missing null check to getFullChunkIfLoaded
fixes #10915
Diffstat (limited to 'patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch')
| -rw-r--r-- | patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch b/patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch index 74b2b07dcd..89d36267c4 100644 --- a/patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch +++ b/patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch @@ -25091,7 +25091,7 @@ index a94833f58eb823332890d07c147161e9e0a938e9..cba80945fa0d8ca55b0d422925f8c94c } } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 4d7e234d379a451c4bb53bc2fcdf22cb191f8d1a..34cb1947f7ce69828115d1473d14732934364985 100644 +index 4d7e234d379a451c4bb53bc2fcdf22cb191f8d1a..f8ea3298a995901e114cb811c01b504c0029c2af 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -184,7 +184,7 @@ import org.bukkit.event.weather.LightningStrikeEvent; @@ -25128,7 +25128,7 @@ index 4d7e234d379a451c4bb53bc2fcdf22cb191f8d1a..34cb1947f7ce69828115d1473d147329 + @Override + public final LevelChunk moonrise$getFullChunkIfLoaded(final int chunkX, final int chunkZ) { + final ca.spottedleaf.moonrise.patches.chunk_system.scheduling.NewChunkHolder newChunkHolder = this.moonrise$getChunkTaskScheduler().chunkHolderManager.getChunkHolder(ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkKey(chunkX, chunkZ)); -+ if (!newChunkHolder.isFullChunkReady()) { ++ if (newChunkHolder == null || !newChunkHolder.isFullChunkReady()) { + return null; + } + |