Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-12-28 03:57:50 +01:00
Code Issues Projects Releases Wiki Activity

Add SendablePacket#extractServerPacket

Browse Source 
Signed-off-by: TheMode <themode@outlook.fr>
This commit is contained in:
TheMode 2021-12-17 19:02:29 +01:00
parent 076b11b77a
commit 5b4ffa0846
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/minestom/server/network/packet/server/SendablePacket.java
View File

@ -2,6 +2,7 @@ package net.minestom.server.network.packet.server;
import net.minestom.server.network.player.PlayerConnection; import net.minestom.server.network.player.PlayerConnection;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
/** /**
* Represents a packet that can be sent to a {@link PlayerConnection}. * Represents a packet that can be sent to a {@link PlayerConnection}.
@ -9,4 +10,17 @@ import org.jetbrains.annotations.ApiStatus;
@ApiStatus.Experimental @ApiStatus.Experimental
public sealed interface SendablePacket public sealed interface SendablePacket
permits ServerPacket, CachedPacket, FramedPacket { permits ServerPacket, CachedPacket, FramedPacket {
@ApiStatus.Experimental
static @NotNull ServerPacket extractServerPacket(@NotNull SendablePacket packet) {
if (packet instanceof ServerPacket serverPacket) {
return serverPacket;
} else if (packet instanceof CachedPacket cachedPacket) {
return cachedPacket.packet();
} else if (packet instanceof FramedPacket framedPacket) {
return framedPacket.packet();
} else {
throw new RuntimeException("Unknown packet type: " + packet.getClass().getName());
}
}
} }

15
src/main/java/net/minestom/server/network/player/FakePlayerConnection.java
View File

@ -4,8 +4,6 @@ import net.minestom.server.MinecraftServer;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import net.minestom.server.entity.fakeplayer.FakePlayer; import net.minestom.server.entity.fakeplayer.FakePlayer;
import net.minestom.server.entity.fakeplayer.FakePlayerController; import net.minestom.server.entity.fakeplayer.FakePlayerController;
import net.minestom.server.network.packet.server.CachedPacket;
import net.minestom.server.network.packet.server.FramedPacket;
import net.minestom.server.network.packet.server.SendablePacket; import net.minestom.server.network.packet.server.SendablePacket;
import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacket;
import net.minestom.server.utils.validate.Check; import net.minestom.server.utils.validate.Check;
@ -19,16 +17,9 @@ public class FakePlayerConnection extends PlayerConnection {
@Override @Override
public void sendPacket(@NotNull SendablePacket packet) { public void sendPacket(@NotNull SendablePacket packet) {
FakePlayerController controller = getFakePlayer().getController(); FakePlayerController controller = getFakePlayer().getController();
if (packet instanceof ServerPacket serverPacket) { final ServerPacket serverPacket = SendablePacket.extractServerPacket(packet);
if (!shouldSendPacket(serverPacket)) return; if (!shouldSendPacket(serverPacket)) return;
controller.consumePacket(serverPacket); controller.consumePacket(serverPacket);
} else if (packet instanceof FramedPacket framedPacket) {
controller.consumePacket(framedPacket.packet());
} else if (packet instanceof CachedPacket cachedPacket) {
controller.consumePacket(cachedPacket.packet());
} else {
throw new RuntimeException("Unknown packet type: " + packet.getClass().getName());
}
} }
@NotNull @NotNull