Made .equals to == check for mushroom biome because it is an enum

Signed-off-by: shedaniel <daniel@shedaniel.me>
momo-i2 · Feb 16, 2021 · 44abdbc · 44abdbc
1 parent c08a87e
commit 44abdbc
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/common/src/main/java/me/shedaniel/lightoverlay/common/LightOverlay.java b/common/src/main/java/me/shedaniel/lightoverlay/common/LightOverlay.java
@@ -36,7 +36,6 @@
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.chunk.ChunkBiomeContainer;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.lighting.LayerLightEventListener;
@@ -222,7 +221,8 @@ private static void calculateChunk(LevelChunk chunk, Level world, ChunkPos chunk
                         map.put(pos.asLong(), Byte.valueOf((byte) level));
                     }
                 } else {
-                    CrossType type = getCrossType(pos, down, chunk, block, sky, entityContext);
+                    Biome biome = mushroom ? world.getBiome(pos) : null;
+                    CrossType type = getCrossType(pos, biome,down, chunk, block, sky, entityContext);
                     if (type != CrossType.NONE) {
                         map.put(pos.asLong(), type);
                     }
@@ -234,7 +234,7 @@ private static void calculateChunk(LevelChunk chunk, Level world, ChunkPos chunk
         }
     }
 
-    public static CrossType getCrossType(BlockPos pos, BlockPos down, BlockGetter world, LayerLightEventListener block, LayerLightEventListener sky, CollisionContext entityContext) {
+    public static CrossType getCrossType(BlockPos pos, Biome biome, BlockPos down, BlockGetter world, LayerLightEventListener block, LayerLightEventListener sky, CollisionContext entityContext) {
         BlockState blockBelowState = world.getBlockState(down);
         BlockState blockUpperState = world.getBlockState(pos);
         VoxelShape upperCollisionShape = blockUpperState.getCollisionShape(world, pos, entityContext);
@@ -254,7 +254,7 @@ public static CrossType getCrossType(BlockPos pos, BlockPos down, BlockGetter wo
         // Check block state allow spawning (excludes bedrock and barriers automatically)
         if (!blockBelowState.isValidSpawn(world, down, TESTING_ENTITY_TYPE.get()))
             return CrossType.NONE;
-        if (!mushroom && CLIENT.level != null && Biome.BiomeCategory.MUSHROOM.equals(CLIENT.level.getBiome(pos).getBiomeCategory()))
+        if (!mushroom && Biome.BiomeCategory.MUSHROOM == biome.getBiomeCategory())
             return CrossType.NONE;
         int blockLightLevel = block.getLightValue(pos);
         int skyLightLevel = sky.getLightValue(pos);
@@ -498,7 +498,8 @@ private static void tick(Minecraft minecraft) {
                                 map.put(blockPos.asLong(), Byte.valueOf((byte) level));
                             }
                         } else {
-                            CrossType type = getCrossType(blockPos, downPos, world, block, sky, collisionContext);
+                            Biome biome = mushroom ? world.getBiome(blockPos) : null;
+                            CrossType type = getCrossType(blockPos, biome, downPos, world, block, sky, collisionContext);
                             if (type != CrossType.NONE) {
                                 map.put(blockPos.asLong(), type);
                             }