Skip to content

Commit 6df9a72

Browse files
committed
fix: Merge conflicts
1 parent 47f0b63 commit 6df9a72

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

surf-api-bukkit/surf-api-bukkit-server/src/main/kotlin/dev/slne/surf/surfapi/bukkit/server/impl/nms/listener/packets/clientbound/ClientboundSystemChatPacketImpl.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ import dev.slne.surf.surfapi.bukkit.api.nms.NmsUseWithCaution
44
import dev.slne.surf.surfapi.bukkit.api.nms.listener.packets.clientbound.SystemChatPacket
55
import dev.slne.surf.surfapi.bukkit.server.nms.toBukkit
66
import net.kyori.adventure.text.Component
7+
import net.minecraft.network.protocol.game.ClientGamePacketListener
78
import net.minecraft.network.protocol.game.ClientboundSystemChatPacket
89

910
@NmsUseWithCaution
1011
class ClientboundSystemChatPacketImpl(nmsPacket: ClientboundSystemChatPacket) :
11-
NmsClientboundPacketImpl<ClientboundSystemChatPacket>(nmsPacket), SystemChatPacket {
12+
NmsClientboundPacketImpl<ClientboundSystemChatPacket, ClientGamePacketListener>(nmsPacket),
13+
SystemChatPacket {
1214
override var content: Component
1315
get() = nmsPacket.content().toBukkit()
1416
set(value) {

0 commit comments

Comments
 (0)