From 4e01c678bc445b0924b4d12707bcb8f5c474ea43 Mon Sep 17 00:00:00 2001
From: Corosauce <cordonfreeman@gmail.com>
Date: Sun, 3 Dec 2023 18:04:27 +0000
Subject: [PATCH] Fix https://github.com/Corosauce/weather2/issues/605
---
src/main/java/weather2/blockentity/DeflectorBlockEntity.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/weather2/blockentity/DeflectorBlockEntity.java b/src/main/java/weather2/blockentity/DeflectorBlockEntity.java
index d957e1cb..c509c595 100644
--- a/src/main/java/weather2/blockentity/DeflectorBlockEntity.java
+++ b/src/main/java/weather2/blockentity/DeflectorBlockEntity.java
@@ -8,6 +8,7 @@
import net.minecraft.world.level.block.state.BlockState;
import weather2.ServerTickHandler;
import weather2.WeatherBlocks;
+import weather2.weathersystem.WeatherManagerServer;
public class DeflectorBlockEntity extends BlockEntity {
@@ -38,6 +39,7 @@ public void init() {
@Override
public void setRemoved() {
super.setRemoved();
- ServerTickHandler.getWeatherManagerFor(level).removeDeflector(getBlockPos());
+ WeatherManagerServer weatherManagerServer = ServerTickHandler.getWeatherManagerFor(level);
+ if (weatherManagerServer != null) weatherManagerServer.removeDeflector(getBlockPos());
}
}