Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-25 12:15:53 +01:00
Code Issues Projects Releases Wiki Activity

fix: remove other duplicate entity controller for POTION in other NMS modules (#3154)

Browse Source 
This appends to #3153
This commit is contained in:
ZX夏夜之风 2024-09-30 19:33:37 +08:00 committed by GitHub
parent 3a3f2cb9ea
commit ebe00ae5c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
View File

@ -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);

1
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
View File

@ -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);

1
v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
View File

@ -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);

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
View File

@ -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);

1
v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
View File

@ -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);

1
v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
View File

@ -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);

1
v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java
View File

@ -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);