2022-12-10 14:11:39 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
|
|
|
|
Date: Sat, 10 Dec 2022 13:01:52 +0100
|
|
|
|
Subject: [PATCH] Fix chunk snapshot biome getter
|
|
|
|
|
|
|
|
Fixes SPIGOT-7188: https://hub.spigotmc.org/jira/browse/SPIGOT-7188
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
|
2023-02-07 16:55:53 +01:00
|
|
|
index 05512cc19eb213b6be5c869e133376ee42827806..c6416b3db0166374065d537e379d05da0f093b21 100644
|
2022-12-10 14:11:39 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
|
2023-02-07 16:55:53 +01:00
|
|
|
@@ -149,7 +149,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
|
2022-12-10 14:11:39 +01:00
|
|
|
Preconditions.checkState(this.biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true");
|
|
|
|
this.validateChunkCoordinates(x, y, z);
|
|
|
|
|
|
|
|
- PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>> biome = this.biome[this.getSectionIndex(y >> 2)];
|
|
|
|
+ PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>> biome = this.biome[this.getSectionIndex(y)]; // Paper
|
|
|
|
return CraftBlock.biomeBaseToBiome(biomeRegistry, biome.get(x >> 2, (y & 0xF) >> 2, z >> 2));
|
|
|
|
}
|
|
|
|
|
2023-02-07 16:55:53 +01:00
|
|
|
@@ -163,7 +163,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
|
2022-12-10 14:11:39 +01:00
|
|
|
Preconditions.checkState(this.biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true");
|
|
|
|
this.validateChunkCoordinates(x, y, z);
|
|
|
|
|
|
|
|
- PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>> biome = this.biome[this.getSectionIndex(y >> 2)];
|
|
|
|
+ PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>> biome = this.biome[this.getSectionIndex(y)]; // Paper
|
|
|
|
return biome.get(x >> 2, (y & 0xF) >> 2, z >> 2).value().getTemperature(new BlockPos((this.x << 4) | x, y, (this.z << 4) | z));
|
|
|
|
}
|
|
|
|
|