From ebe00ae5c685e08b6601886fc76e2e6fd652c0ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ZX=E5=A4=8F=E5=A4=9C=E4=B9=8B=E9=A3=8E?= Date: Mon, 30 Sep 2024 19:33:37 +0800 Subject: [PATCH] fix: remove other duplicate entity controller for POTION in other NMS modules (#3154) This appends to #3153 --- .../main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java | 1 - .../main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java | 1 - .../main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java | 1 - .../main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java | 1 - .../main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java | 1 - .../main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java | 1 - .../main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java | 1 - 7 files changed, 7 deletions(-) diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java index 775a28d9d..64315622d 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java @@ -900,7 +900,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.TRADER_LLAMA, TraderLlamaController.class); EntityControllers.setEntityControllerForType(EntityType.WANDERING_TRADER, WanderingTraderController.class); EntityControllers.setEntityControllerForType(EntityType.LLAMA_SPIT, LlamaSpitController.class); - EntityControllers.setEntityControllerForType(EntityType.SPLASH_POTION, ThrownPotionController.class); EntityControllers.setEntityControllerForType(EntityType.MAGMA_CUBE, MagmaCubeController.class); EntityControllers.setEntityControllerForType(EntityType.MINECART, MinecartRideableController.class); EntityControllers.setEntityControllerForType(EntityType.MINECART_CHEST, MinecartChestController.class); diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java index 7741a33f6..a09ecdd76 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java @@ -917,7 +917,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.TRADER_LLAMA, TraderLlamaController.class); EntityControllers.setEntityControllerForType(EntityType.WANDERING_TRADER, WanderingTraderController.class); EntityControllers.setEntityControllerForType(EntityType.LLAMA_SPIT, LlamaSpitController.class); - EntityControllers.setEntityControllerForType(EntityType.SPLASH_POTION, ThrownPotionController.class); EntityControllers.setEntityControllerForType(EntityType.MAGMA_CUBE, MagmaCubeController.class); EntityControllers.setEntityControllerForType(EntityType.MINECART, MinecartRideableController.class); EntityControllers.setEntityControllerForType(EntityType.MINECART_CHEST, MinecartChestController.class); diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java index f7c9bc412..42f47e5da 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java @@ -941,7 +941,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.TRADER_LLAMA, TraderLlamaController.class); EntityControllers.setEntityControllerForType(EntityType.WANDERING_TRADER, WanderingTraderController.class); EntityControllers.setEntityControllerForType(EntityType.LLAMA_SPIT, LlamaSpitController.class); - EntityControllers.setEntityControllerForType(EntityType.SPLASH_POTION, ThrownPotionController.class); EntityControllers.setEntityControllerForType(EntityType.MAGMA_CUBE, MagmaCubeController.class); EntityControllers.setEntityControllerForType(EntityType.MINECART, MinecartRideableController.class); EntityControllers.setEntityControllerForType(EntityType.MINECART_CHEST, MinecartChestController.class); diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java index 631738d21..5519e0ce8 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java @@ -948,7 +948,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.TRADER_LLAMA, TraderLlamaController.class); EntityControllers.setEntityControllerForType(EntityType.WANDERING_TRADER, WanderingTraderController.class); EntityControllers.setEntityControllerForType(EntityType.LLAMA_SPIT, LlamaSpitController.class); - EntityControllers.setEntityControllerForType(EntityType.SPLASH_POTION, ThrownPotionController.class); EntityControllers.setEntityControllerForType(EntityType.MARKER, MarkerController.class); EntityControllers.setEntityControllerForType(EntityType.MAGMA_CUBE, MagmaCubeController.class); EntityControllers.setEntityControllerForType(EntityType.MINECART, MinecartRideableController.class); diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java index 611a943f5..41ac12ca1 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java @@ -955,7 +955,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.TRADER_LLAMA, TraderLlamaController.class); EntityControllers.setEntityControllerForType(EntityType.WANDERING_TRADER, WanderingTraderController.class); EntityControllers.setEntityControllerForType(EntityType.LLAMA_SPIT, LlamaSpitController.class); - EntityControllers.setEntityControllerForType(EntityType.SPLASH_POTION, ThrownPotionController.class); EntityControllers.setEntityControllerForType(EntityType.MARKER, MarkerController.class); EntityControllers.setEntityControllerForType(EntityType.MAGMA_CUBE, MagmaCubeController.class); EntityControllers.setEntityControllerForType(EntityType.MINECART, MinecartRideableController.class); 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 4e32426a8..ba14492d9 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 @@ -1023,7 +1023,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.MINECART_HOPPER, MinecartHopperController.class); EntityControllers.setEntityControllerForType(EntityType.MINECART_TNT, MinecartTNTController.class); EntityControllers.setEntityControllerForType(EntityType.MUSHROOM_COW, MushroomCowController.class); - EntityControllers.setEntityControllerForType(EntityType.SPLASH_POTION, ThrownPotionController.class); EntityControllers.setEntityControllerForType(EntityType.OCELOT, OcelotController.class); EntityControllers.setEntityControllerForType(EntityType.PANDA, PandaController.class); EntityControllers.setEntityControllerForType(EntityType.PAINTING, PaintingController.class); diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java index ba1e54b29..4aa81f926 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java @@ -1068,7 +1068,6 @@ public class NMSImpl implements NMSBridge { EntityControllers.setEntityControllerForType(EntityType.PLAYER, HumanController.class); EntityControllers.setEntityControllerForType(EntityType.POLAR_BEAR, PolarBearController.class); EntityControllers.setEntityControllerForType(EntityType.POTION, ThrownPotionController.class); - EntityControllers.setEntityControllerForType(EntityType.POTION, ThrownPotionController.class); EntityControllers.setEntityControllerForType(EntityType.PUFFERFISH, PufferFishController.class); EntityControllers.setEntityControllerForType(EntityType.RABBIT, RabbitController.class); EntityControllers.setEntityControllerForType(EntityType.RAVAGER, RavagerController.class);