Merge pull request #151 from Giraaffes/mc-1.18.x/1.18.2

Fix for #147
cc-tweaked · Sep 15, 2023 · 0e90d5e · 0e90d5e
2 parents f2380ec + 511456f
commit 0e90d5e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/config/license/api.txt b/config/license/api.txt
@@ -1,3 +1,3 @@
 This file is part of the public ComputerCraft API - http://www.computercraft.info
-Copyright Daniel Ratcliffe, 2011-${year}. This API may be redistributed unmodified and in full only.
+Copyright Daniel Ratcliffe, 2011-2022. This API may be redistributed unmodified and in full only.
 For help using the API, and posting your mods, visit the forums at computercraft.info.
diff --git a/config/license/main.txt b/config/license/main.txt
@@ -1,3 +1,3 @@
 This file is part of ComputerCraft - http://www.computercraft.info
-Copyright Daniel Ratcliffe, 2011-${year}. Do not distribute without permission.
+Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
 Send enquiries to [email protected]
diff --git a/src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java b/src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java
@@ -191,6 +191,10 @@ public void sendTerminalState( Player player )
 
     public void broadcastDelete()
     {
+        // We could be in the process of shutting down the server, so we can't send packets in this case.
+        MinecraftServer server = GameInstanceUtils.getServer();
+        if( server == null || server.isStopped() ) return;
+
         // Send deletion to client
         NetworkHandler.sendToAllPlayers( new ComputerDeletedClientMessage( getInstanceID() ) );
     }