From 904d83de43aae884e6211c098063769b8933682f Mon Sep 17 00:00:00 2001 From: fullwall Date: Sun, 19 Mar 2023 01:27:13 +0800 Subject: [PATCH] Fix incorrect controller for item/text display --- .../citizensnpcs/nms/v1_19_R3/entity/ParrotController.java | 2 -- .../main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java index 0d3596775..b13893bac 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ParrotController.java @@ -84,8 +84,6 @@ public class ParrotController extends MobEntityController { } } - - @Override public SoundEvent getAmbientSound() { return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.Metadata.AMBIENT_SOUND); diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java index 07439e9be..0c9fdd7e7 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java @@ -1019,8 +1019,8 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.ZOMBIE_VILLAGER, ZombieVillagerController.class); EntityControllers.setEntityControllerForType(EntityType.SNIFFER, SnifferController.class); EntityControllers.setEntityControllerForType(EntityType.BLOCK_DISPLAY, BlockDisplayController.class); - EntityControllers.setEntityControllerForType(EntityType.ITEM_DISPLAY, TextDisplayController.class); - EntityControllers.setEntityControllerForType(EntityType.TEXT_DISPLAY, ItemDisplayController.class); + EntityControllers.setEntityControllerForType(EntityType.TEXT_DISPLAY, TextDisplayController.class); + EntityControllers.setEntityControllerForType(EntityType.ITEM_DISPLAY, ItemDisplayController.class); EntityControllers.setEntityControllerForType(EntityType.INTERACTION, InteractionController.class); }