Remove direct refrences to GeyserImpl.getInstance()

This commit is contained in:
rtm516 2023-04-25 23:16:51 +01:00
parent de6d56554f
commit 3cadfe5306
No known key found for this signature in database
GPG key ID: 331715B8B007C67A

View file

@ -34,7 +34,6 @@ import org.cloudburstmc.protocol.common.PacketSignal;
import org.geysermc.connect.extension.ui.UIHandler; import org.geysermc.connect.extension.ui.UIHandler;
import org.geysermc.connect.extension.utils.ServerManager; import org.geysermc.connect.extension.utils.ServerManager;
import org.geysermc.connect.extension.utils.Utils; import org.geysermc.connect.extension.utils.Utils;
import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.entity.attribute.GeyserAttributeType; import org.geysermc.geyser.entity.attribute.GeyserAttributeType;
import org.geysermc.geyser.network.UpstreamPacketHandler; import org.geysermc.geyser.network.UpstreamPacketHandler;
import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.session.GeyserSession;
@ -51,7 +50,7 @@ public class PacketHandler extends UpstreamPacketHandler {
private final BedrockPacketHandler originalPacketHandler; private final BedrockPacketHandler originalPacketHandler;
public PacketHandler(GeyserConnect geyserConnect, GeyserSession session, BedrockPacketHandler packetHandler) { public PacketHandler(GeyserConnect geyserConnect, GeyserSession session, BedrockPacketHandler packetHandler) {
super(GeyserImpl.getInstance(), session); super(session.getGeyser(), session);
this.session = session; this.session = session;
this.geyserConnect = geyserConnect; this.geyserConnect = geyserConnect;
@ -134,7 +133,7 @@ public class PacketHandler extends UpstreamPacketHandler {
updateAttributesPacket.setAttributes(attributes); updateAttributesPacket.setAttributes(attributes);
// Doesn't work 100% of the time but fixes it most of the time // Doesn't work 100% of the time but fixes it most of the time
GeyserImpl.getInstance().getScheduledThread().schedule(() -> session.sendUpstreamPacket(updateAttributesPacket), 500, TimeUnit.MILLISECONDS); session.getGeyser().getScheduledThread().schedule(() -> session.sendUpstreamPacket(updateAttributesPacket), 500, TimeUnit.MILLISECONDS);
return super.handle(packet); return super.handle(packet);
} }