From 0758cb6c69e52e11c74319ae5cd5c90ec410c7e3 Mon Sep 17 00:00:00 2001
From: LordMZTE <lord@mzte.de>
Date: Thu, 16 Mar 2023 18:03:10 +0100
Subject: [PATCH] fix: more packet spam

---
 .../the_aether/AetherEventHandler.java        | 28 ++++++++++---------
 .../the_aether/world/AetherWorldProvider.java |  5 ++--
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/gildedgames/the_aether/AetherEventHandler.java b/src/main/java/com/gildedgames/the_aether/AetherEventHandler.java
index ceeae27..ca73100 100644
--- a/src/main/java/com/gildedgames/the_aether/AetherEventHandler.java
+++ b/src/main/java/com/gildedgames/the_aether/AetherEventHandler.java
@@ -24,11 +24,8 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.ObfuscationReflectionHelper;
 import cpw.mods.fml.common.eventhandler.Event;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.InputEvent;
-import cpw.mods.fml.common.gameevent.PlayerEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
-import net.minecraft.client.Minecraft;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityAgeable;
@@ -38,12 +35,10 @@ import net.minecraft.entity.boss.EntityWither;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.passive.EntityCow;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.*;
 import net.minecraft.util.MovingObjectPosition.MovingObjectType;
@@ -52,11 +47,9 @@ import net.minecraft.world.WorldProvider;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.event.entity.EntityStruckByLightningEvent;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
-import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.living.LivingDropsEvent;
 import net.minecraftforge.event.entity.living.LivingFallEvent;
 import net.minecraftforge.event.entity.player.*;
-import net.minecraftforge.event.world.WorldEvent;
 
 public class AetherEventHandler {
     @SubscribeEvent
@@ -397,14 +390,23 @@ public class AetherEventHandler {
                 AetherWorldProvider providerAether = (AetherWorldProvider) provider;
 
                 providerAether.setIsEternalDay(data.isEternalDay());
-                AetherNetwork.sendToAll(
-                    new PacketSendEternalDay(providerAether.getIsEternalDay())
-                );
+                if (providerAether.getIsEternalDay() != providerAether.eternalDayPrev) {
+                    AetherNetwork.sendToAll(
+                        new PacketSendEternalDay(providerAether.getIsEternalDay())
+                    );
+                    providerAether.eternalDayPrev = providerAether.getIsEternalDay();
+                }
 
                 providerAether.setShouldCycleCatchup(data.isShouldCycleCatchup());
-                AetherNetwork.sendToAll(
-                    new PacketSendShouldCycle(providerAether.getShouldCycleCatchup())
-                );
+                if (providerAether.getShouldCycleCatchup()
+                    != providerAether.shouldCycleCatchupPrev) {
+                    AetherNetwork.sendToAll(
+                        new PacketSendShouldCycle(providerAether.getShouldCycleCatchup())
+                    );
+
+                    providerAether.shouldCycleCatchupPrev
+                        = providerAether.getShouldCycleCatchup();
+                }
             }
         }
 
diff --git a/src/main/java/com/gildedgames/the_aether/world/AetherWorldProvider.java b/src/main/java/com/gildedgames/the_aether/world/AetherWorldProvider.java
index 3beb8e3..d731b5e 100644
--- a/src/main/java/com/gildedgames/the_aether/world/AetherWorldProvider.java
+++ b/src/main/java/com/gildedgames/the_aether/world/AetherWorldProvider.java
@@ -7,7 +7,6 @@ import com.gildedgames.the_aether.player.PlayerAether;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.WorldProvider;
@@ -19,7 +18,9 @@ public class AetherWorldProvider extends WorldProvider {
     private float[] colorsSunriseSunset = new float[4];
 
     private boolean eternalDay;
+    public boolean eternalDayPrev;
     private boolean shouldCycleCatchup;
+    public boolean shouldCycleCatchupPrev;
     private long aetherTime = 6000;
 
     public AetherWorldProvider() {
@@ -227,4 +228,4 @@ public class AetherWorldProvider extends WorldProvider {
             ) {}
         };
     }
-}
\ No newline at end of file
+}