GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

remove requestedPacks from GeyserSession

Browse source
This commit is contained in:
Ethan 2024-07-04 13:43:21 +08:00
parent 16efe8eec5
commit 7e8e4efba8
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
View file

@ -221,6 +221,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
private boolean sendPacksRequested = false; private boolean sendPacksRequested = false;
private boolean haveAllPacksRequested = false; private boolean haveAllPacksRequested = false;
private boolean requestedPackData = false;
@Override @Override
public PacketSignal handle(ResourcePackClientResponsePacket packet) { public PacketSignal handle(ResourcePackClientResponsePacket packet) {
@ -228,9 +229,9 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
case COMPLETED: case COMPLETED:
if (!sendPacksRequested && haveAllPacksRequested && GeyserImpl.getInstance().getConfig().isForceResourcePacks()) { if (!sendPacksRequested && haveAllPacksRequested && GeyserImpl.getInstance().getConfig().isForceResourcePacks()) {
session.setRequestedPacks(true); requestedPackData = true;
} }
if (session.isRequestedPacks()) { if (requestedPackData) {
session.setOptionalPackLoaded(this.optionalPackLoaded); session.setOptionalPackLoaded(this.optionalPackLoaded);
} }
geyser.getLogger().debug("Geyser Optional Pack loaded: " + (session.isOptionalPackLoaded() ? "Yes" : "No")); geyser.getLogger().debug("Geyser Optional Pack loaded: " + (session.isOptionalPackLoaded() ? "Yes" : "No"));
@ -245,7 +246,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
case SEND_PACKS: case SEND_PACKS:
sendPacksRequested = true; sendPacksRequested = true;
session.setRequestedPacks(true); requestedPackData = true;
packsToSent.addAll(packet.getPackIds()); packsToSent.addAll(packet.getPackIds());
sendPackDataInfo(packsToSent.pop()); sendPackDataInfo(packsToSent.pop());
break; break;
@ -326,7 +327,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
@Override @Override
public PacketSignal handle(ResourcePackChunkRequestPacket packet) { public PacketSignal handle(ResourcePackChunkRequestPacket packet) {
session.setRequestedPacks(true); requestedPackData = true;
ResourcePackChunkDataPacket data = new ResourcePackChunkDataPacket(); ResourcePackChunkDataPacket data = new ResourcePackChunkDataPacket();
ResourcePack pack = this.resourcePackLoadEvent.getPacks().get(packet.getPackId().toString()); ResourcePack pack = this.resourcePackLoadEvent.getPacks().get(packet.getPackId().toString());
PackCodec codec = pack.codec(); PackCodec codec = pack.codec();

3
core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
View file

@ -486,9 +486,6 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
@Setter @Setter
private float walkSpeed; private float walkSpeed;
@Setter
private boolean requestedPacks = false;
@Setter @Setter
private boolean optionalPackLoaded = false; private boolean optionalPackLoaded = false;
/** /**