From faa6d08e6519546c418c6792103f34660064a798 Mon Sep 17 00:00:00 2001
From: bconlon <aidan90803@icloud.com>
Date: Wed, 29 Jul 2020 12:45:39 -0700
Subject: [PATCH] Better eternal day packet handling, probably fixes the
 occasional crash that kept popping up.

---
 .../network/packets/PacketSendEternalDay.java       | 13 ++++++++-----
 .../network/packets/PacketSendShouldCycle.java      | 13 ++++++++-----
 .../aether/network/packets/PacketSendTime.java      | 13 ++++++++-----
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/legacy/aether/network/packets/PacketSendEternalDay.java b/src/main/java/com/legacy/aether/network/packets/PacketSendEternalDay.java
index adbd5f9..fa7f1cc 100644
--- a/src/main/java/com/legacy/aether/network/packets/PacketSendEternalDay.java
+++ b/src/main/java/com/legacy/aether/network/packets/PacketSendEternalDay.java
@@ -35,13 +35,16 @@ public class PacketSendEternalDay extends AetherPacket<PacketSendEternalDay>
     @Override
     public void handleClient(PacketSendEternalDay message, EntityPlayer player)
     {
-        WorldProvider provider = player.worldObj.provider;
-
-        if (provider instanceof AetherWorldProvider)
+        if (player != null && player.worldObj != null && player.worldObj.provider != null)
         {
-            AetherWorldProvider providerAether = (AetherWorldProvider) provider;
+            WorldProvider provider = player.worldObj.provider;
 
-            providerAether.setIsEternalDay(message.eternalDay);
+            if (provider instanceof AetherWorldProvider)
+            {
+                AetherWorldProvider providerAether = (AetherWorldProvider) provider;
+
+                providerAether.setIsEternalDay(message.eternalDay);
+            }
         }
     }
 
diff --git a/src/main/java/com/legacy/aether/network/packets/PacketSendShouldCycle.java b/src/main/java/com/legacy/aether/network/packets/PacketSendShouldCycle.java
index 6f899df..fcdf240 100644
--- a/src/main/java/com/legacy/aether/network/packets/PacketSendShouldCycle.java
+++ b/src/main/java/com/legacy/aether/network/packets/PacketSendShouldCycle.java
@@ -35,13 +35,16 @@ public class PacketSendShouldCycle extends AetherPacket<PacketSendShouldCycle>
     @Override
     public void handleClient(PacketSendShouldCycle message, EntityPlayer player)
     {
-        WorldProvider provider = player.worldObj.provider;
-
-        if (provider instanceof AetherWorldProvider)
+        if (player != null && player.worldObj != null && player.worldObj.provider != null)
         {
-            AetherWorldProvider providerAether = (AetherWorldProvider) provider;
+            WorldProvider provider = player.worldObj.provider;
 
-            providerAether.setShouldCycleCatchup(message.shouldCycle);
+            if (provider instanceof AetherWorldProvider)
+            {
+                AetherWorldProvider providerAether = (AetherWorldProvider) provider;
+
+                providerAether.setShouldCycleCatchup(message.shouldCycle);
+            }
         }
     }
 
diff --git a/src/main/java/com/legacy/aether/network/packets/PacketSendTime.java b/src/main/java/com/legacy/aether/network/packets/PacketSendTime.java
index f159b70..54e39cc 100644
--- a/src/main/java/com/legacy/aether/network/packets/PacketSendTime.java
+++ b/src/main/java/com/legacy/aether/network/packets/PacketSendTime.java
@@ -37,13 +37,16 @@ public class PacketSendTime extends AetherPacket<PacketSendTime>
     @Override
     public void handleClient(PacketSendTime message, EntityPlayer player)
     {
-        WorldProvider provider = player.worldObj.provider;
-
-        if (provider instanceof AetherWorldProvider)
+        if (player != null && player.worldObj != null && player.worldObj.provider != null)
         {
-            AetherWorldProvider providerAether = (AetherWorldProvider) provider;
+            WorldProvider provider = player.worldObj.provider;
 
-            providerAether.setAetherTime(message.time);
+            if (provider instanceof AetherWorldProvider)
+            {
+                AetherWorldProvider providerAether = (AetherWorldProvider) provider;
+
+                providerAether.setAetherTime(message.time);
+            }
         }
     }