Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Trial protocollib change suggested in #3097

This commit is contained in:
fullwall 2024-02-28 01:57:23 +08:00
parent 5a33c5cdbf
commit 3869e310a2
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/src/main/java/net/citizensnpcs/ProtocolLibListener.java
View File

@ -9,7 +9,6 @@ import java.util.UUID;
import java.util.function.Function; import java.util.function.Function;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -228,13 +227,9 @@ public class ProtocolLibListener implements Listener {
private NPC getNPCFromPacket(PacketEvent event) { private NPC getNPCFromPacket(PacketEvent event) {
PacketContainer packet = event.getPacket(); PacketContainer packet = event.getPacket();
Entity entity = null;
try { try {
Integer id = packet.getIntegers().readSafely(0); Object entityModifier = packet.getEntityModifier(event).getTarget();
if (id == null) return entityModifier instanceof NPCHolder ? ((NPCHolder) entityModifier).getNPC() : null;
return null;
entity = manager.getEntityFromID(event.getPlayer().getWorld(), id);
} catch (FieldAccessException | IllegalArgumentException ex) { } catch (FieldAccessException | IllegalArgumentException ex) {
if (!LOGGED_ERROR) { if (!LOGGED_ERROR) {
Messaging.severe( Messaging.severe(
@ -246,7 +241,6 @@ public class ProtocolLibListener implements Listener {
} }
return null; return null;
} }
return entity instanceof NPCHolder ? ((NPCHolder) entity).getNPC() : null;
} }
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)