From 28c466e342b5eb7b95e9a0d8bfa76312acbf79fb Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Sat, 9 Sep 2023 11:35:37 -0500 Subject: [PATCH] clean: remove old inheritance that no longer matters --- .../hmccosmetics/util/packets/BasePacket.java | 13 ------------- .../hmccosmetics/util/packets/PacketManager.java | 8 +++++++- 2 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/BasePacket.java diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/BasePacket.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/BasePacket.java deleted file mode 100644 index 6e517355..00000000 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/BasePacket.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hibiscusmc.hmccosmetics.util.packets; - -import com.comphenix.protocol.ProtocolLibrary; -import com.comphenix.protocol.events.PacketContainer; -import org.bukkit.entity.Player; - -public class BasePacket { - - public static void sendPacket(Player player, PacketContainer packet) { - if (player == null) return; - ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet, false); - } -} diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/PacketManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/PacketManager.java index a0fec33a..629d4735 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/PacketManager.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/packets/PacketManager.java @@ -1,6 +1,7 @@ package com.hibiscusmc.hmccosmetics.util.packets; import com.comphenix.protocol.PacketType; +import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.wrappers.*; import com.google.common.collect.Lists; @@ -29,7 +30,7 @@ import java.util.Collections; import java.util.List; import java.util.UUID; -public class PacketManager extends BasePacket { +public class PacketManager { public static void sendEntitySpawnPacket( final @NotNull Location location, @@ -550,4 +551,9 @@ public class PacketManager extends BasePacket { } return viewers; } + + public static void sendPacket(Player player, PacketContainer packet) { + if (player == null) return; + ProtocolLibrary.getProtocolManager().sendServerPacket(player, packet, null,false); + } }