From 7e8e4efba8c132c43c8646e8ea0669f2176c5459 Mon Sep 17 00:00:00 2001
From: Ethan <ethpsa09@gmail.com>
Date: Thu, 4 Jul 2024 13:43:21 +0800
Subject: [PATCH] remove requestedPacks from GeyserSession

---
 .../geysermc/geyser/network/UpstreamPacketHandler.java   | 9 +++++----
 .../java/org/geysermc/geyser/session/GeyserSession.java  | 3 ---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
index 214195ded..bafee94de 100644
--- a/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
+++ b/core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
@@ -221,6 +221,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
 
     private boolean sendPacksRequested = false;
     private boolean haveAllPacksRequested = false;
+    private boolean requestedPackData = false;
 
     @Override
     public PacketSignal handle(ResourcePackClientResponsePacket packet) {
@@ -228,9 +229,9 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
 
             case COMPLETED:
                 if (!sendPacksRequested && haveAllPacksRequested && GeyserImpl.getInstance().getConfig().isForceResourcePacks()) {
-                    session.setRequestedPacks(true);
+                    requestedPackData = true;
                 }
-                if (session.isRequestedPacks()) {
+                if (requestedPackData) {
                     session.setOptionalPackLoaded(this.optionalPackLoaded);
                 }
                 geyser.getLogger().debug("Geyser Optional Pack loaded: " + (session.isOptionalPackLoaded() ? "Yes" : "No"));
@@ -245,7 +246,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
 
             case SEND_PACKS:
                 sendPacksRequested = true;
-                session.setRequestedPacks(true);
+                requestedPackData = true;
                 packsToSent.addAll(packet.getPackIds());
                 sendPackDataInfo(packsToSent.pop());
                 break;
@@ -326,7 +327,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
 
     @Override
     public PacketSignal handle(ResourcePackChunkRequestPacket packet) {
-        session.setRequestedPacks(true);
+        requestedPackData = true;
         ResourcePackChunkDataPacket data = new ResourcePackChunkDataPacket();
         ResourcePack pack = this.resourcePackLoadEvent.getPacks().get(packet.getPackId().toString());
         PackCodec codec = pack.codec();
diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
index 301346c10..b7a28f46e 100644
--- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
+++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
@@ -486,9 +486,6 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
     @Setter
     private float walkSpeed;
 
-    @Setter
-    private boolean requestedPacks = false;
-
     @Setter
     private boolean optionalPackLoaded = false;
     /**