GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-19 14:59:27 +00:00
Code Issues Releases Activity

Small fixes to previous commit

Browse Source
This commit is contained in:
onebeastchris
2025-08-03 22:01:39 +02:00
parent e6ecfcdfee
commit efa41e05b7
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/org/geysermc/geyser/GeyserImpl.java
View File

@@ -53,7 +53,6 @@ import org.geysermc.floodgate.crypto.FloodgateCipher;
import org.geysermc.floodgate.news.NewsItemAction; import org.geysermc.floodgate.news.NewsItemAction;
import org.geysermc.geyser.api.GeyserApi; import org.geysermc.geyser.api.GeyserApi;
import org.geysermc.geyser.api.command.CommandSource; import org.geysermc.geyser.api.command.CommandSource;
import org.geysermc.geyser.api.event.EventBus;
import org.geysermc.geyser.api.event.EventRegistrar; import org.geysermc.geyser.api.event.EventRegistrar;
import org.geysermc.geyser.api.event.lifecycle.GeyserPostInitializeEvent; import org.geysermc.geyser.api.event.lifecycle.GeyserPostInitializeEvent;
import org.geysermc.geyser.api.event.lifecycle.GeyserPostReloadEvent; import org.geysermc.geyser.api.event.lifecycle.GeyserPostReloadEvent;
@@ -750,11 +749,7 @@ public class GeyserImpl implements GeyserApi, EventRegistrar {
@Override @Override
@NonNull @NonNull
public EventBus<EventRegistrar> eventBus() { public GeyserEventBus eventBus() {
return this.eventBus;
}
public GeyserEventBus geyserEventBus() {
return this.eventBus; return this.eventBus;
} }

16
core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
View File

@@ -231,7 +231,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
session.sendUpstreamPacket(playStatus); session.sendUpstreamPacket(playStatus);
this.resourcePackLoadEvent = new SessionLoadResourcePacksEventImpl(session); this.resourcePackLoadEvent = new SessionLoadResourcePacksEventImpl(session);
this.geyser.geyserEventBus().fireEventElseKick(this.resourcePackLoadEvent, session); this.geyser.eventBus().fireEventElseKick(this.resourcePackLoadEvent, session);
if (session.isClosed()) { if (session.isClosed()) {
// Can happen if an error occurs in the resource pack event; that'll disconnect the player // Can happen if an error occurs in the resource pack event; that'll disconnect the player
return PacketSignal.HANDLED; return PacketSignal.HANDLED;
@@ -252,6 +252,10 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
@Override @Override
public PacketSignal handle(ResourcePackClientResponsePacket packet) { public PacketSignal handle(ResourcePackClientResponsePacket packet) {
if (session.getUpstream().isClosed() || session.isClosed()) {
return PacketSignal.HANDLED;
}
if (finishedResourcePackSending) { if (finishedResourcePackSending) {
session.disconnect("Illegal duplicate resource pack response packet received!"); session.disconnect("Illegal duplicate resource pack response packet received!");
return PacketSignal.HANDLED; return PacketSignal.HANDLED;
@@ -298,7 +302,10 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
session.sendUpstreamPacket(stackPacket); session.sendUpstreamPacket(stackPacket);
} }
default -> session.disconnect("disconnectionScreen.resourcePack"); default -> {
GeyserImpl.getInstance().getLogger().debug("received unknown status packet: " + packet);
session.disconnect("disconnectionScreen.resourcePack");
}
} }
return PacketSignal.HANDLED; return PacketSignal.HANDLED;
@@ -306,6 +313,9 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
@Override @Override
public PacketSignal handle(ModalFormResponsePacket packet) { public PacketSignal handle(ModalFormResponsePacket packet) {
if (session.getUpstream().isClosed() || session.isClosed()) {
return PacketSignal.HANDLED;
}
session.executeInEventLoop(() -> session.getFormCache().handleResponse(packet)); session.executeInEventLoop(() -> session.getFormCache().handleResponse(packet));
return PacketSignal.HANDLED; return PacketSignal.HANDLED;
} }
@@ -347,7 +357,7 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
@Override @Override
public PacketSignal handle(ResourcePackChunkRequestPacket packet) { public PacketSignal handle(ResourcePackChunkRequestPacket packet) {
if (session.isClosed()) { if (session.getUpstream().isClosed() || session.isClosed()) {
return PacketSignal.HANDLED; return PacketSignal.HANDLED;
} }