From 0cf96b1b005cbffa8c4de0d7fda72d7d2b58752e Mon Sep 17 00:00:00 2001 From: Cola Date: Wed, 22 Dec 2021 22:43:06 +0000 Subject: [PATCH] Fix cast error & update protocol lib --- plugins/finale-paper/build.gradle.kts | 2 +- .../com/github/maxopoly/finale/combat/AsyncPacketHandler.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/finale-paper/build.gradle.kts b/plugins/finale-paper/build.gradle.kts index 31fbbd967..501e65f92 100644 --- a/plugins/finale-paper/build.gradle.kts +++ b/plugins/finale-paper/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { paperDevBundle("1.18-R0.1-SNAPSHOT") compileOnly("net.civmc:civmodcore:2.0.0-SNAPSHOT:dev-all") compileOnly("net.civmc.combattagplus:combattagplus-spigot:2.0.0-SNAPSHOT:dev") - compileOnly("com.comphenix.protocol:ProtocolLib:4.7.0") + compileOnly("com.comphenix.protocol:ProtocolLib:4.8.0-SNAPSHOT") } java { diff --git a/plugins/finale-paper/src/main/java/com/github/maxopoly/finale/combat/AsyncPacketHandler.java b/plugins/finale-paper/src/main/java/com/github/maxopoly/finale/combat/AsyncPacketHandler.java index c0b59f268..ce3d73eb0 100644 --- a/plugins/finale-paper/src/main/java/com/github/maxopoly/finale/combat/AsyncPacketHandler.java +++ b/plugins/finale-paper/src/main/java/com/github/maxopoly/finale/combat/AsyncPacketHandler.java @@ -25,6 +25,7 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.craftbukkit.v1_18_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_18_R1.entity.CraftLivingEntity; import org.bukkit.entity.Damageable; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; @@ -91,7 +92,7 @@ public class AsyncPacketHandler extends PacketAdapter implements Listener { return; } - CombatUtil.attack(attacker, (net.minecraft.world.entity.LivingEntity) entityTarget); + CombatUtil.attack(attacker, ((CraftLivingEntity) entityTarget).getHandle()); } }.runTask(Finale.getPlugin()); } else if (packetType == PacketType.Play.Client.ARM_ANIMATION) {