From aa3654c3fab785f52df2afb89c2b7d9a157b65e3 Mon Sep 17 00:00:00 2001 From: fullwall Date: Mon, 10 Jul 2017 01:00:35 +0800 Subject: [PATCH] Use minecraft logic for minecarts --- .../nonliving/MinecartChestController.java | 3 +-- .../nonliving/MinecartCommandController.java | 3 +-- .../nonliving/MinecartFurnaceController.java | 3 +-- .../nonliving/MinecartHopperController.java | 3 +-- .../nonliving/MinecartRideableController.java | 3 +-- .../nonliving/MinecartSpawnerController.java | 3 +-- .../nonliving/MinecartTNTController.java | 3 +-- .../nonliving/MinecartChestController.java | 19 +++++++++---------- .../nonliving/MinecartCommandController.java | 19 +++++++++---------- .../nonliving/MinecartFurnaceController.java | 19 +++++++++---------- .../nonliving/MinecartHopperController.java | 19 +++++++++---------- .../nonliving/MinecartRideableController.java | 3 +-- .../nonliving/MinecartSpawnerController.java | 19 +++++++++---------- .../nonliving/MinecartTNTController.java | 19 +++++++++---------- .../nonliving/MinecartChestController.java | 18 +++++++++--------- .../nonliving/MinecartCommandController.java | 19 +++++++++---------- .../nonliving/MinecartFurnaceController.java | 19 +++++++++---------- .../nonliving/MinecartHopperController.java | 19 +++++++++---------- .../nonliving/MinecartRideableController.java | 3 +-- .../nonliving/MinecartSpawnerController.java | 18 +++++++++--------- .../nonliving/MinecartTNTController.java | 19 +++++++++---------- 21 files changed, 117 insertions(+), 136 deletions(-) diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java index 476396aab..48b3ed65b 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java @@ -100,11 +100,10 @@ public class MinecartChestController extends MobEntityController { @Override public void m() { + super.m(); if (npc != null) { npc.update(); NMSImpl.minecartItemLogic(this); - } else { - super.m(); } } } diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java index 886391e26..1bfd47892 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java @@ -100,11 +100,10 @@ public class MinecartCommandController extends MobEntityController { @Override public void m() { + super.m(); if (npc != null) { npc.update(); NMSImpl.minecartItemLogic(this); - } else { - super.m(); } } } diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java index b88ddf2b3..018e34306 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java @@ -100,11 +100,10 @@ public class MinecartFurnaceController extends MobEntityController { @Override public void m() { + super.m(); if (npc != null) { npc.update(); NMSImpl.minecartItemLogic(this); - } else { - super.m(); } } } diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java index 4578b8268..92fb37bb2 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java @@ -88,11 +88,10 @@ public class MinecartHopperController extends MobEntityController { @Override public void m() { + super.m(); if (npc != null) { npc.update(); NMSImpl.minecartItemLogic(this); - } else { - super.m(); } } } diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java index 6433917eb..b053cd298 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java @@ -100,11 +100,10 @@ public class MinecartRideableController extends MobEntityController { @Override public void m() { + super.m(); if (npc != null) { npc.update(); NMSImpl.minecartItemLogic(this); - } else { - super.m(); } } } diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java index 82d60d921..685d704a9 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java @@ -88,11 +88,10 @@ public class MinecartSpawnerController extends MobEntityController { @Override public void m() { + super.m(); if (npc != null) { npc.update(); NMSImpl.minecartItemLogic(this); - } else { - super.m(); } } } diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java index 9a1a80720..de4ac87bf 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java @@ -88,11 +88,10 @@ public class MinecartTNTController extends MobEntityController { @Override public void m() { + super.m(); if (npc != null) { npc.update(); NMSImpl.minecartItemLogic(this); - } else { - super.m(); } } } diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java index 313c59bd7..a7bfff482 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java @@ -41,6 +41,15 @@ public class MinecartChestController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public void A_() { + super.A_(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling @@ -97,16 +106,6 @@ public class MinecartChestController extends MobEntityController { public NPC getNPC() { return npc; } - - @Override - public void A_() { - if (npc != null) { - npc.update(); - NMSImpl.minecartItemLogic(this); - } else { - super.A_(); - } - } } public static class MinecartChestNPC extends CraftMinecartChest implements NPCHolder { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java index 1a82acdcb..6fe966713 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java @@ -41,6 +41,15 @@ public class MinecartCommandController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public void A_() { + super.A_(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling @@ -97,16 +106,6 @@ public class MinecartCommandController extends MobEntityController { public NPC getNPC() { return npc; } - - @Override - public void A_() { - if (npc != null) { - npc.update(); - NMSImpl.minecartItemLogic(this); - } else { - super.A_(); - } - } } public static class MinecartCommandNPC extends CraftMinecartCommand implements NPCHolder { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java index 33d1a8ca0..874ef74c6 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java @@ -41,6 +41,15 @@ public class MinecartFurnaceController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public void A_() { + super.A_(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling @@ -97,16 +106,6 @@ public class MinecartFurnaceController extends MobEntityController { public NPC getNPC() { return npc; } - - @Override - public void A_() { - if (npc != null) { - npc.update(); - NMSImpl.minecartItemLogic(this); - } else { - super.A_(); - } - } } public static class MinecartFurnaceNPC extends CraftMinecartFurnace implements NPCHolder { diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java index 5afcc982f..44b498a9e 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java @@ -37,6 +37,15 @@ public class MinecartHopperController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public void A_() { + super.A_(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling @@ -85,15 +94,5 @@ public class MinecartHopperController extends MobEntityController { public NPC getNPC() { return npc; } - - @Override - public void A_() { - if (npc != null) { - npc.update(); - NMSImpl.minecartItemLogic(this); - } else { - super.A_(); - } - } } } \ No newline at end of file diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java index e4a9bb267..d2be4c32d 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java @@ -43,11 +43,10 @@ public class MinecartRideableController extends MobEntityController { @Override public void A_() { + super.A_(); if (npc != null) { npc.update(); NMSImpl.minecartItemLogic(this); - } else { - super.A_(); } } diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java index b3651b240..cc57ed31f 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java @@ -37,6 +37,15 @@ public class MinecartSpawnerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public void A_() { + super.A_(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling @@ -85,15 +94,5 @@ public class MinecartSpawnerController extends MobEntityController { public NPC getNPC() { return npc; } - - @Override - public void A_() { - if (npc != null) { - npc.update(); - NMSImpl.minecartItemLogic(this); - } else { - super.A_(); - } - } } } \ No newline at end of file diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java index 1b7af6bb9..021753f31 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java @@ -37,6 +37,15 @@ public class MinecartTNTController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public void A_() { + super.A_(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + @Override public void collide(net.minecraft.server.v1_11_R1.Entity entity) { // this method is called by both the entities involved - cancelling @@ -85,15 +94,5 @@ public class MinecartTNTController extends MobEntityController { public NPC getNPC() { return npc; } - - @Override - public void A_() { - if (npc != null) { - npc.update(); - NMSImpl.minecartItemLogic(this); - } else { - super.A_(); - } - } } } \ No newline at end of file diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java index 49cdd3e14..8691c92fd 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java @@ -41,6 +41,15 @@ public class MinecartChestController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public void B_() { + super.B_(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + @Override public void collide(net.minecraft.server.v1_12_R1.Entity entity) { // this method is called by both the entities involved - cancelling @@ -98,15 +107,6 @@ public class MinecartChestController extends MobEntityController { return npc; } - @Override - public void B_() { - if (npc != null) { - npc.update(); - NMSImpl.minecartItemLogic(this); - } else { - super.B_(); - } - } } public static class MinecartChestNPC extends CraftMinecartChest implements NPCHolder { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java index a66a9648b..8c1fa7f59 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java @@ -41,6 +41,15 @@ public class MinecartCommandController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public void B_() { + super.B_(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + @Override public void collide(net.minecraft.server.v1_12_R1.Entity entity) { // this method is called by both the entities involved - cancelling @@ -97,16 +106,6 @@ public class MinecartCommandController extends MobEntityController { public NPC getNPC() { return npc; } - - @Override - public void B_() { - if (npc != null) { - npc.update(); - NMSImpl.minecartItemLogic(this); - } else { - super.B_(); - } - } } public static class MinecartCommandNPC extends CraftMinecartCommand implements NPCHolder { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java index eaaeb864c..0659319e8 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java @@ -41,6 +41,15 @@ public class MinecartFurnaceController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public void B_() { + super.B_(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + @Override public void collide(net.minecraft.server.v1_12_R1.Entity entity) { // this method is called by both the entities involved - cancelling @@ -97,16 +106,6 @@ public class MinecartFurnaceController extends MobEntityController { public NPC getNPC() { return npc; } - - @Override - public void B_() { - if (npc != null) { - npc.update(); - NMSImpl.minecartItemLogic(this); - } else { - super.B_(); - } - } } public static class MinecartFurnaceNPC extends CraftMinecartFurnace implements NPCHolder { diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java index b12a90a1a..22c4b5f01 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java @@ -37,6 +37,15 @@ public class MinecartHopperController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public void B_() { + super.B_(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + @Override public void collide(net.minecraft.server.v1_12_R1.Entity entity) { // this method is called by both the entities involved - cancelling @@ -85,15 +94,5 @@ public class MinecartHopperController extends MobEntityController { public NPC getNPC() { return npc; } - - @Override - public void B_() { - if (npc != null) { - npc.update(); - NMSImpl.minecartItemLogic(this); - } else { - super.B_(); - } - } } } \ No newline at end of file diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java index 90c780ded..5dc5a615d 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java @@ -43,11 +43,10 @@ public class MinecartRideableController extends MobEntityController { @Override public void B_() { + super.B_(); if (npc != null) { npc.update(); NMSImpl.minecartItemLogic(this); - } else { - super.B_(); } } diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java index a3887ba4d..08a0546f5 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java @@ -37,6 +37,15 @@ public class MinecartSpawnerController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public void B_() { + super.B_(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + @Override public void collide(net.minecraft.server.v1_12_R1.Entity entity) { // this method is called by both the entities involved - cancelling @@ -86,14 +95,5 @@ public class MinecartSpawnerController extends MobEntityController { return npc; } - @Override - public void B_() { - if (npc != null) { - npc.update(); - NMSImpl.minecartItemLogic(this); - } else { - super.B_(); - } - } } } \ No newline at end of file diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java index 9e80d8b87..454a07ddb 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java @@ -37,6 +37,15 @@ public class MinecartTNTController extends MobEntityController { this.npc = (CitizensNPC) npc; } + @Override + public void B_() { + super.B_(); + if (npc != null) { + npc.update(); + NMSImpl.minecartItemLogic(this); + } + } + @Override public void collide(net.minecraft.server.v1_12_R1.Entity entity) { // this method is called by both the entities involved - cancelling @@ -85,15 +94,5 @@ public class MinecartTNTController extends MobEntityController { public NPC getNPC() { return npc; } - - @Override - public void B_() { - if (npc != null) { - npc.update(); - NMSImpl.minecartItemLogic(this); - } else { - super.B_(); - } - } } } \ No newline at end of file