Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-16 20:31:30 +01:00
Code Issues Projects Releases Wiki Activity

Use minecraft logic for minecarts

Browse Source
This commit is contained in:
fullwall 2017-07-10 01:00:35 +08:00
parent 093533b0ea
commit aa3654c3fa
21 changed files with 117 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartChestController.java
View File

@ -100,11 +100,10 @@ public class MinecartChestController extends MobEntityController {
@Override @Override
public void m() { public void m() {
super.m();
if (npc != null) { if (npc != null) {
npc.update(); npc.update();
NMSImpl.minecartItemLogic(this); NMSImpl.minecartItemLogic(this);
} else {
super.m();
} }
} }
} }

3
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartCommandController.java
View File

@ -100,11 +100,10 @@ public class MinecartCommandController extends MobEntityController {
@Override @Override
public void m() { public void m() {
super.m();
if (npc != null) { if (npc != null) {
npc.update(); npc.update();
NMSImpl.minecartItemLogic(this); NMSImpl.minecartItemLogic(this);
} else {
super.m();
} }
} }
} }

3
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartFurnaceController.java
View File

@ -100,11 +100,10 @@ public class MinecartFurnaceController extends MobEntityController {
@Override @Override
public void m() { public void m() {
super.m();
if (npc != null) { if (npc != null) {
npc.update(); npc.update();
NMSImpl.minecartItemLogic(this); NMSImpl.minecartItemLogic(this);
} else {
super.m();
} }
} }
} }

3
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartHopperController.java
View File

@ -88,11 +88,10 @@ public class MinecartHopperController extends MobEntityController {
@Override @Override
public void m() { public void m() {
super.m();
if (npc != null) { if (npc != null) {
npc.update(); npc.update();
NMSImpl.minecartItemLogic(this); NMSImpl.minecartItemLogic(this);
} else {
super.m();
} }
} }
} }

3
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartRideableController.java
View File

@ -100,11 +100,10 @@ public class MinecartRideableController extends MobEntityController {
@Override @Override
public void m() { public void m() {
super.m();
if (npc != null) { if (npc != null) {
npc.update(); npc.update();
NMSImpl.minecartItemLogic(this); NMSImpl.minecartItemLogic(this);
} else {
super.m();
} }
} }
} }

3
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartSpawnerController.java
View File

@ -88,11 +88,10 @@ public class MinecartSpawnerController extends MobEntityController {
@Override @Override
public void m() { public void m() {
super.m();
if (npc != null) { if (npc != null) {
npc.update(); npc.update();
NMSImpl.minecartItemLogic(this); NMSImpl.minecartItemLogic(this);
} else {
super.m();
} }
} }
} }

3
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/nonliving/MinecartTNTController.java
View File

@ -88,11 +88,10 @@ public class MinecartTNTController extends MobEntityController {
@Override @Override
public void m() { public void m() {
super.m();
if (npc != null) { if (npc != null) {
npc.update(); npc.update();
NMSImpl.minecartItemLogic(this); NMSImpl.minecartItemLogic(this);
} else {
super.m();
} }
} }
} }

19
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartChestController.java
View File

@ -41,6 +41,15 @@ public class MinecartChestController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
} }
@Override
public void A_() {
super.A_();
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
}
}
@Override @Override
public void collide(net.minecraft.server.v1_11_R1.Entity entity) { public void collide(net.minecraft.server.v1_11_R1.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
@ -97,16 +106,6 @@ public class MinecartChestController extends MobEntityController {
public NPC getNPC() { public NPC getNPC() {
return npc; 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 { public static class MinecartChestNPC extends CraftMinecartChest implements NPCHolder {

19
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartCommandController.java
View File

@ -41,6 +41,15 @@ public class MinecartCommandController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
} }
@Override
public void A_() {
super.A_();
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
}
}
@Override @Override
public void collide(net.minecraft.server.v1_11_R1.Entity entity) { public void collide(net.minecraft.server.v1_11_R1.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
@ -97,16 +106,6 @@ public class MinecartCommandController extends MobEntityController {
public NPC getNPC() { public NPC getNPC() {
return npc; 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 { public static class MinecartCommandNPC extends CraftMinecartCommand implements NPCHolder {

19
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartFurnaceController.java
View File

@ -41,6 +41,15 @@ public class MinecartFurnaceController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
} }
@Override
public void A_() {
super.A_();
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
}
}
@Override @Override
public void collide(net.minecraft.server.v1_11_R1.Entity entity) { public void collide(net.minecraft.server.v1_11_R1.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
@ -97,16 +106,6 @@ public class MinecartFurnaceController extends MobEntityController {
public NPC getNPC() { public NPC getNPC() {
return npc; 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 { public static class MinecartFurnaceNPC extends CraftMinecartFurnace implements NPCHolder {

19
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartHopperController.java
View File

@ -37,6 +37,15 @@ public class MinecartHopperController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
} }
@Override
public void A_() {
super.A_();
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
}
}
@Override @Override
public void collide(net.minecraft.server.v1_11_R1.Entity entity) { public void collide(net.minecraft.server.v1_11_R1.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
@ -85,15 +94,5 @@ public class MinecartHopperController extends MobEntityController {
public NPC getNPC() { public NPC getNPC() {
return npc; return npc;
} }
@Override
public void A_() {
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
} else {
super.A_();
}
}
} }
} }

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartRideableController.java
View File

@ -43,11 +43,10 @@ public class MinecartRideableController extends MobEntityController {
@Override @Override
public void A_() { public void A_() {
super.A_();
if (npc != null) { if (npc != null) {
npc.update(); npc.update();
NMSImpl.minecartItemLogic(this); NMSImpl.minecartItemLogic(this);
} else {
super.A_();
} }
} }

19
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartSpawnerController.java
View File

@ -37,6 +37,15 @@ public class MinecartSpawnerController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
} }
@Override
public void A_() {
super.A_();
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
}
}
@Override @Override
public void collide(net.minecraft.server.v1_11_R1.Entity entity) { public void collide(net.minecraft.server.v1_11_R1.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
@ -85,15 +94,5 @@ public class MinecartSpawnerController extends MobEntityController {
public NPC getNPC() { public NPC getNPC() {
return npc; return npc;
} }
@Override
public void A_() {
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
} else {
super.A_();
}
}
} }
} }

19
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/nonliving/MinecartTNTController.java
View File

@ -37,6 +37,15 @@ public class MinecartTNTController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
} }
@Override
public void A_() {
super.A_();
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
}
}
@Override @Override
public void collide(net.minecraft.server.v1_11_R1.Entity entity) { public void collide(net.minecraft.server.v1_11_R1.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
@ -85,15 +94,5 @@ public class MinecartTNTController extends MobEntityController {
public NPC getNPC() { public NPC getNPC() {
return npc; return npc;
} }
@Override
public void A_() {
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
} else {
super.A_();
}
}
} }
} }

18
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartChestController.java
View File

@ -41,6 +41,15 @@ public class MinecartChestController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
} }
@Override
public void B_() {
super.B_();
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
}
}
@Override @Override
public void collide(net.minecraft.server.v1_12_R1.Entity entity) { public void collide(net.minecraft.server.v1_12_R1.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
@ -98,15 +107,6 @@ public class MinecartChestController extends MobEntityController {
return npc; 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 { public static class MinecartChestNPC extends CraftMinecartChest implements NPCHolder {

19
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartCommandController.java
View File

@ -41,6 +41,15 @@ public class MinecartCommandController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
} }
@Override
public void B_() {
super.B_();
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
}
}
@Override @Override
public void collide(net.minecraft.server.v1_12_R1.Entity entity) { public void collide(net.minecraft.server.v1_12_R1.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
@ -97,16 +106,6 @@ public class MinecartCommandController extends MobEntityController {
public NPC getNPC() { public NPC getNPC() {
return npc; 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 { public static class MinecartCommandNPC extends CraftMinecartCommand implements NPCHolder {

19
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartFurnaceController.java
View File

@ -41,6 +41,15 @@ public class MinecartFurnaceController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
} }
@Override
public void B_() {
super.B_();
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
}
}
@Override @Override
public void collide(net.minecraft.server.v1_12_R1.Entity entity) { public void collide(net.minecraft.server.v1_12_R1.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
@ -97,16 +106,6 @@ public class MinecartFurnaceController extends MobEntityController {
public NPC getNPC() { public NPC getNPC() {
return npc; 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 { public static class MinecartFurnaceNPC extends CraftMinecartFurnace implements NPCHolder {

19
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartHopperController.java
View File

@ -37,6 +37,15 @@ public class MinecartHopperController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
} }
@Override
public void B_() {
super.B_();
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
}
}
@Override @Override
public void collide(net.minecraft.server.v1_12_R1.Entity entity) { public void collide(net.minecraft.server.v1_12_R1.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
@ -85,15 +94,5 @@ public class MinecartHopperController extends MobEntityController {
public NPC getNPC() { public NPC getNPC() {
return npc; return npc;
} }
@Override
public void B_() {
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
} else {
super.B_();
}
}
} }
} }

3
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartRideableController.java
View File

@ -43,11 +43,10 @@ public class MinecartRideableController extends MobEntityController {
@Override @Override
public void B_() { public void B_() {
super.B_();
if (npc != null) { if (npc != null) {
npc.update(); npc.update();
NMSImpl.minecartItemLogic(this); NMSImpl.minecartItemLogic(this);
} else {
super.B_();
} }
} }

18
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartSpawnerController.java
View File

@ -37,6 +37,15 @@ public class MinecartSpawnerController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
} }
@Override
public void B_() {
super.B_();
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
}
}
@Override @Override
public void collide(net.minecraft.server.v1_12_R1.Entity entity) { public void collide(net.minecraft.server.v1_12_R1.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
@ -86,14 +95,5 @@ public class MinecartSpawnerController extends MobEntityController {
return npc; return npc;
} }
@Override
public void B_() {
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
} else {
super.B_();
}
}
} }
} }

19
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/nonliving/MinecartTNTController.java
View File

@ -37,6 +37,15 @@ public class MinecartTNTController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
} }
@Override
public void B_() {
super.B_();
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
}
}
@Override @Override
public void collide(net.minecraft.server.v1_12_R1.Entity entity) { public void collide(net.minecraft.server.v1_12_R1.Entity entity) {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
@ -85,15 +94,5 @@ public class MinecartTNTController extends MobEntityController {
public NPC getNPC() { public NPC getNPC() {
return npc; return npc;
} }
@Override
public void B_() {
if (npc != null) {
npc.update();
NMSImpl.minecartItemLogic(this);
} else {
super.B_();
}
}
} }
} }