From 06ac4f8ffc6f69594f7af2f53c35bf42b00aefa5 Mon Sep 17 00:00:00 2001 From: Pim van der Loos Date: Mon, 4 Jan 2021 11:59:46 +0100 Subject: [PATCH] Support latest ProtocolLib - Switched to JitPack for the ProtocolLib repository. See dmulloy2/ProtocolLib#1047. - Using the new interface of generated classes when checking if a player is a proxy player. See dmulloy2/ProtocolLib#1053. --- pom.xml | 8 ++++---- .../packets/packetlisteners/PacketListenerInventory.java | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index d4c016ad..24eca407 100644 --- a/pom.xml +++ b/pom.xml @@ -76,9 +76,9 @@ 1.18.10 - com.comphenix.protocol + com.github.dmulloy2 ProtocolLib - 4.5.0 + master-SNAPSHOT org.spigotmc @@ -112,8 +112,8 @@ - dmulloy2-repo - https://repo.dmulloy2.net/nexus/repository/public/ + jitpack.io + https://jitpack.io md_5-releases diff --git a/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerInventory.java b/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerInventory.java index 2fb36344..4c7ecffc 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerInventory.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerInventory.java @@ -8,6 +8,7 @@ import com.comphenix.protocol.events.PacketAdapter; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketEvent; import com.comphenix.protocol.reflect.StructureModifier; +import com.comphenix.protocol.utility.ByteBuddyGenerated; import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.LibsDisguises; import me.libraryaddict.disguise.disguisetypes.Disguise; @@ -44,7 +45,7 @@ public class PacketListenerInventory extends PacketAdapter { if (player.getName().contains("UNKNOWN[")) // If the player is temporary return; - if (player instanceof com.comphenix.net.sf.cglib.proxy.Factory || player.getVehicle() != null) { + if (player instanceof ByteBuddyGenerated || player.getVehicle() != null) { return; } @@ -250,7 +251,7 @@ public class PacketListenerInventory extends PacketAdapter { Player player = event.getPlayer(); // If the inventory is the players inventory - if (player instanceof com.comphenix.net.sf.cglib.proxy.Factory || player.getVehicle() != null || + if (player instanceof ByteBuddyGenerated || player.getVehicle() != null || event.getPacket().getIntegers().read(0) != 0) { return; }