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

Do a null check on downstream channel when sending packets

Browse source
This commit is contained in:
Camotoy 2021-08-19 12:37:14 -04:00
parent 52fa0679c9
commit 89dde2aec3
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
View file

@ -57,6 +57,7 @@ import com.nukkitx.protocol.bedrock.data.command.CommandPermission;
import com.nukkitx.protocol.bedrock.data.entity.EntityData; import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.*; import com.nukkitx.protocol.bedrock.packet.*;
import io.netty.channel.Channel;
import io.netty.channel.EventLoop; import io.netty.channel.EventLoop;
import it.unimi.dsi.fastutil.ints.*; import it.unimi.dsi.fastutil.ints.*;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
@ -75,7 +76,6 @@ import org.geysermc.connector.common.AuthType;
import org.geysermc.connector.configuration.EmoteOffhandWorkaroundOption; import org.geysermc.connector.configuration.EmoteOffhandWorkaroundOption;
import org.geysermc.connector.entity.Entity; import org.geysermc.connector.entity.Entity;
import org.geysermc.connector.entity.ItemFrameEntity; import org.geysermc.connector.entity.ItemFrameEntity;
import org.geysermc.connector.entity.ThrowableEntity;
import org.geysermc.connector.entity.Tickable; import org.geysermc.connector.entity.Tickable;
import org.geysermc.connector.entity.attribute.GeyserAttributeType; import org.geysermc.connector.entity.attribute.GeyserAttributeType;
import org.geysermc.connector.entity.player.SessionPlayerEntity; import org.geysermc.connector.entity.player.SessionPlayerEntity;
@ -1230,7 +1230,14 @@ public class GeyserSession implements CommandSender {
*/ */
public void sendDownstreamPacket(Packet packet) { public void sendDownstreamPacket(Packet packet) {
if (!closed && this.downstream != null) { if (!closed && this.downstream != null) {
EventLoop eventLoop = this.downstream.getChannel().eventLoop(); Channel channel = this.downstream.getChannel();
if (channel == null) {
// Channel is set to null when downstream is disconnected - there is a short window for this to happen
// as downstream doesn't call GeyserSession#disconnect
return;
}
EventLoop eventLoop = channel.eventLoop();
if (eventLoop.inEventLoop()) { if (eventLoop.inEventLoop()) {
sendDownstreamPacket0(packet); sendDownstreamPacket0(packet);
} else { } else {