Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implement NPCPistonPushEvent

This commit is contained in:
fullwall 2023-06-25 22:37:30 +08:00
parent 46f4444c10
commit 309b1d7b65
1029 changed files with 5680 additions and 326 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/ArmorStandController.java
View File

@ -14,7 +14,6 @@ import net.citizensnpcs.nms.v1_10_R1.util.NMSBoundingBox;
import net.citizensnpcs.nms.v1_10_R1.util.NMSImpl;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_10_R1.AxisAlignedBB;
import net.minecraft.server.v1_10_R1.EntityArmorStand;
@ -93,8 +92,6 @@ public class ArmorStandController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

8
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BatController.java
View File

@ -56,7 +56,7 @@ public class BatController extends MobEntityController {
super(world);
this.npc = (CitizensNPC) npc;
if (npc != null) {
setFlying(false);
setAsleep(false);
}
}
@ -101,8 +101,6 @@ public class BatController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);
@ -149,9 +147,5 @@ public class BatController extends MobEntityController {
npc.update();
}
}
public void setFlying(boolean flying) {
setAsleep(flying);
}
}
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/BlazeController.java
View File

@ -98,8 +98,6 @@ public class BlazeController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CaveSpiderController.java
View File

@ -114,8 +114,6 @@ public class CaveSpiderController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ChickenController.java
View File

@ -123,8 +123,6 @@ public class ChickenController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CowController.java
View File

@ -138,8 +138,6 @@ public class CowController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/CreeperController.java
View File

@ -131,8 +131,6 @@ public class CreeperController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermanController.java
View File

@ -113,8 +113,6 @@ public class EndermanController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/EndermiteController.java
View File

@ -113,8 +113,6 @@ public class EndermiteController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GhastController.java
View File

@ -89,8 +89,6 @@ public class GhastController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GiantController.java
View File

@ -99,8 +99,6 @@ public class GiantController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/GuardianController.java
View File

@ -100,8 +100,6 @@ public class GuardianController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/HorseController.java
View File

@ -128,8 +128,6 @@ public class HorseController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/IronGolemController.java
View File

@ -99,8 +99,6 @@ public class IronGolemController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MagmaCubeController.java
View File

@ -112,8 +112,6 @@ public class MagmaCubeController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/MushroomCowController.java
View File

@ -118,8 +118,6 @@ public class MushroomCowController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java
View File

@ -115,8 +115,6 @@ public class OcelotController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigController.java
View File

@ -118,8 +118,6 @@ public class PigController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PigZombieController.java
View File

@ -99,8 +99,6 @@ public class PigZombieController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/PolarBearController.java
View File

@ -93,8 +93,6 @@ public class PolarBearController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/RabbitController.java
View File

@ -110,8 +110,6 @@ public class RabbitController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SheepController.java
View File

@ -108,8 +108,6 @@ public class SheepController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java
View File

@ -100,8 +100,6 @@ public class ShulkerController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SilverfishController.java
View File

@ -99,8 +99,6 @@ public class SilverfishController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SkeletonController.java
View File

@ -99,8 +99,6 @@ public class SkeletonController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SlimeController.java
View File

@ -113,8 +113,6 @@ public class SlimeController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SnowmanController.java
View File

@ -99,8 +99,6 @@ public class SnowmanController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SpiderController.java
View File

@ -99,8 +99,6 @@ public class SpiderController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/SquidController.java
View File

@ -99,8 +99,6 @@ public class SquidController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/VillagerController.java
View File

@ -132,8 +132,6 @@ public class VillagerController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitchController.java
View File

@ -99,8 +99,6 @@ public class WitchController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WitherController.java
View File

@ -89,8 +89,6 @@ public class WitherController extends MobEntityController {
: npc.data().get("wither-arrow-shield");
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/WolfController.java
View File

@ -111,8 +111,6 @@ public class WolfController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ZombieController.java
View File

@ -99,8 +99,6 @@ public class ZombieController extends MobEntityController {
}
}
@Override
public void g(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

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

@ -13,7 +13,6 @@ import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.nms.v1_11_R1.util.NMSBoundingBox;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_11_R1.AxisAlignedBB;
import net.minecraft.server.v1_11_R1.EntityArmorStand;
@ -99,8 +98,6 @@ public class ArmorStandController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

8
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BatController.java
View File

@ -56,7 +56,7 @@ public class BatController extends MobEntityController {
super(world);
this.npc = (CitizensNPC) npc;
if (npc != null) {
setFlying(false);
setAsleep(false);
}
}
@ -101,8 +101,6 @@ public class BatController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);
@ -150,9 +148,5 @@ public class BatController extends MobEntityController {
npc.update();
}
}
public void setFlying(boolean flying) {
setAsleep(flying);
}
}
}

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/BlazeController.java
View File

@ -98,8 +98,6 @@ public class BlazeController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CaveSpiderController.java
View File

@ -114,8 +114,6 @@ public class CaveSpiderController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ChickenController.java
View File

@ -123,8 +123,6 @@ public class ChickenController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CowController.java
View File

@ -138,8 +138,6 @@ public class CowController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/CreeperController.java
View File

@ -123,8 +123,6 @@ public class CreeperController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermanController.java
View File

@ -113,8 +113,6 @@ public class EndermanController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EndermiteController.java
View File

@ -113,8 +113,6 @@ public class EndermiteController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/EvokerController.java
View File

@ -100,8 +100,6 @@ public class EvokerController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GhastController.java
View File

@ -89,8 +89,6 @@ public class GhastController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GiantController.java
View File

@ -99,8 +99,6 @@ public class GiantController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianController.java
View File

@ -100,8 +100,6 @@ public class GuardianController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/GuardianElderController.java
View File

@ -100,8 +100,6 @@ public class GuardianElderController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseController.java
View File

@ -120,8 +120,6 @@ public class HorseController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java
View File

@ -120,8 +120,6 @@ public class HorseDonkeyController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java
View File

@ -120,8 +120,6 @@ public class HorseMuleController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java
View File

@ -121,8 +121,6 @@ public class HorseSkeletonController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java
View File

@ -121,8 +121,6 @@ public class HorseZombieController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/IronGolemController.java
View File

@ -99,8 +99,6 @@ public class IronGolemController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/LlamaController.java
View File

@ -120,8 +120,6 @@ public class LlamaController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MagmaCubeController.java
View File

@ -120,8 +120,6 @@ public class MagmaCubeController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/MushroomCowController.java
View File

@ -117,8 +117,6 @@ public class MushroomCowController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java
View File

@ -115,8 +115,6 @@ public class OcelotController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigController.java
View File

@ -116,8 +116,6 @@ public class PigController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PigZombieController.java
View File

@ -99,8 +99,6 @@ public class PigZombieController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/PolarBearController.java
View File

@ -93,8 +93,6 @@ public class PolarBearController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/RabbitController.java
View File

@ -110,8 +110,6 @@ public class RabbitController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SheepController.java
View File

@ -108,8 +108,6 @@ public class SheepController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java
View File

@ -110,8 +110,6 @@ public class ShulkerController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SilverfishController.java
View File

@ -99,8 +99,6 @@ public class SilverfishController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonController.java
View File

@ -99,8 +99,6 @@ public class SkeletonController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonStrayController.java
View File

@ -99,8 +99,6 @@ public class SkeletonStrayController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SkeletonWitherController.java
View File

@ -99,8 +99,6 @@ public class SkeletonWitherController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SlimeController.java
View File

@ -121,8 +121,6 @@ public class SlimeController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SnowmanController.java
View File

@ -99,8 +99,6 @@ public class SnowmanController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SpiderController.java
View File

@ -99,8 +99,6 @@ public class SpiderController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/SquidController.java
View File

@ -99,8 +99,6 @@ public class SquidController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VexController.java
View File

@ -87,8 +87,6 @@ public class VexController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VillagerController.java
View File

@ -138,8 +138,6 @@ public class VillagerController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/VindicatorController.java
View File

@ -109,8 +109,6 @@ public class VindicatorController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitchController.java
View File

@ -99,8 +99,6 @@ public class WitchController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WitherController.java
View File

@ -89,8 +89,6 @@ public class WitherController extends MobEntityController {
: npc.data().get("wither-arrow-shield");
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/WolfController.java
View File

@ -111,8 +111,6 @@ public class WolfController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieController.java
View File

@ -99,8 +99,6 @@ public class ZombieController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieHuskController.java
View File

@ -99,8 +99,6 @@ public class ZombieHuskController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ZombieVillagerController.java
View File

@ -99,8 +99,6 @@ public class ZombieVillagerController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

6
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ArmorStandController.java
View File

@ -19,6 +19,7 @@ import net.minecraft.server.v1_12_R1.EntityArmorStand;
import net.minecraft.server.v1_12_R1.EntityHuman;
import net.minecraft.server.v1_12_R1.EnumHand;
import net.minecraft.server.v1_12_R1.EnumInteractionResult;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import net.minecraft.server.v1_12_R1.Vec3D;
import net.minecraft.server.v1_12_R1.World;
@ -48,6 +49,11 @@ public class ArmorStandController extends MobEntityController {
}
public static class EntityArmorStandNPC extends EntityArmorStand implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private final CitizensNPC npc;
public EntityArmorStandNPC(World world) {

14
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BatController.java
View File

@ -18,6 +18,7 @@ import net.minecraft.server.v1_12_R1.AxisAlignedBB;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityBat;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import net.minecraft.server.v1_12_R1.SoundEffect;
import net.minecraft.server.v1_12_R1.World;
@ -47,6 +48,11 @@ public class BatController extends MobEntityController {
}
public static class EntityBatNPC extends EntityBat implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private final CitizensNPC npc;
public EntityBatNPC(World world) {
@ -57,7 +63,7 @@ public class BatController extends MobEntityController {
super(world);
this.npc = (CitizensNPC) npc;
if (npc != null) {
setFlying(false);
setAsleep(false);
}
}
@ -102,8 +108,6 @@ public class BatController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);
@ -151,9 +155,5 @@ public class BatController extends MobEntityController {
npc.update();
}
}
public void setFlying(boolean flying) {
setAsleep(flying);
}
}
}

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/BlazeController.java
View File

@ -18,6 +18,7 @@ import net.minecraft.server.v1_12_R1.AxisAlignedBB;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityBlaze;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import net.minecraft.server.v1_12_R1.SoundEffect;
import net.minecraft.server.v1_12_R1.World;
@ -47,6 +48,11 @@ public class BlazeController extends MobEntityController {
}
public static class EntityBlazeNPC extends EntityBlaze implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private final CitizensNPC npc;
public EntityBlazeNPC(World world) {
@ -99,8 +105,6 @@ public class BlazeController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CaveSpiderController.java
View File

@ -19,6 +19,7 @@ import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityCaveSpider;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import net.minecraft.server.v1_12_R1.SoundEffect;
@ -49,6 +50,11 @@ public class CaveSpiderController extends MobEntityController {
}
public static class EntityCaveSpiderNPC extends EntityCaveSpider implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private final CitizensNPC npc;
public EntityCaveSpiderNPC(World world) {
@ -124,8 +130,6 @@ public class CaveSpiderController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ChickenController.java
View File

@ -19,6 +19,7 @@ import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityChicken;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import net.minecraft.server.v1_12_R1.SoundEffect;
@ -49,6 +50,11 @@ public class ChickenController extends MobEntityController {
}
public static class EntityChickenNPC extends EntityChicken implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private final CitizensNPC npc;
public EntityChickenNPC(World world) {
@ -133,8 +139,6 @@ public class ChickenController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CowController.java
View File

@ -21,6 +21,7 @@ import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityCow;
import net.minecraft.server.v1_12_R1.EntityHuman;
import net.minecraft.server.v1_12_R1.EnumHand;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.ItemStack;
import net.minecraft.server.v1_12_R1.Items;
@ -53,6 +54,11 @@ public class CowController extends MobEntityController {
}
public static class EntityCowNPC extends EntityCow implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private final CitizensNPC npc;
public EntityCowNPC(World world) {
@ -148,8 +154,6 @@ public class CowController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/CreeperController.java
View File

@ -20,6 +20,7 @@ import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityCreeper;
import net.minecraft.server.v1_12_R1.EntityLightning;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import net.minecraft.server.v1_12_R1.SoundEffect;
@ -50,6 +51,11 @@ public class CreeperController extends MobEntityController {
}
public static class EntityCreeperNPC extends EntityCreeper implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private boolean allowPowered;
private final CitizensNPC npc;
@ -133,8 +139,6 @@ public class CreeperController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

6
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EnderDragonController.java
View File

@ -22,6 +22,7 @@ import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.DragonControllerPhase;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityEnderDragon;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.IEntitySelector;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import net.minecraft.server.v1_12_R1.SoundEffect;
@ -53,6 +54,11 @@ public class EnderDragonController extends MobEntityController {
}
public static class EntityEnderDragonNPC extends EntityEnderDragon implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private final CitizensNPC npc;
public EntityEnderDragonNPC(World world) {

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermanController.java
View File

@ -19,6 +19,7 @@ import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityEnderman;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import net.minecraft.server.v1_12_R1.SoundEffect;
@ -49,6 +50,11 @@ public class EndermanController extends MobEntityController {
}
public static class EntityEndermanNPC extends EntityEnderman implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private final CitizensNPC npc;
public EntityEndermanNPC(World world) {
@ -123,8 +129,6 @@ public class EndermanController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EndermiteController.java
View File

@ -19,6 +19,7 @@ import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityEndermite;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import net.minecraft.server.v1_12_R1.SoundEffect;
@ -49,6 +50,11 @@ public class EndermiteController extends MobEntityController {
}
public static class EntityEndermiteNPC extends EntityEndermite implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private final CitizensNPC npc;
public EntityEndermiteNPC(World world) {
@ -123,8 +129,6 @@ public class EndermiteController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EvokerController.java
View File

@ -19,6 +19,7 @@ import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityEvoker;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import net.minecraft.server.v1_12_R1.SoundEffect;
@ -35,6 +36,11 @@ public class EvokerController extends MobEntityController {
}
public static class EntityEvokerNPC extends EntityEvoker implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private final CitizensNPC npc;
public EntityEvokerNPC(World world) {
@ -110,8 +116,6 @@ public class EvokerController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GhastController.java
View File

@ -18,6 +18,7 @@ import net.minecraft.server.v1_12_R1.AxisAlignedBB;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityGhast;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import net.minecraft.server.v1_12_R1.SoundEffect;
import net.minecraft.server.v1_12_R1.World;
@ -33,6 +34,11 @@ public class GhastController extends MobEntityController {
}
public static class EntityGhastNPC extends EntityGhast implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private final CitizensNPC npc;
public EntityGhastNPC(World world) {
@ -90,8 +96,6 @@ public class GhastController extends MobEntityController {
return npc == null ? super.d(save) : false;
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GiantController.java
View File

@ -19,6 +19,7 @@ import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityGiantZombie;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import net.minecraft.server.v1_12_R1.SoundEffect;
@ -35,6 +36,11 @@ public class GiantController extends MobEntityController {
}
public static class EntityGiantNPC extends EntityGiantZombie implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private final CitizensNPC npc;
public EntityGiantNPC(World world) {
@ -109,8 +115,6 @@ public class GiantController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianController.java
View File

@ -19,6 +19,7 @@ import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityGuardian;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import net.minecraft.server.v1_12_R1.SoundEffect;
@ -35,6 +36,11 @@ public class GuardianController extends MobEntityController {
}
public static class EntityGuardianNPC extends EntityGuardian implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private final CitizensNPC npc;
public EntityGuardianNPC(World world) {
@ -110,8 +116,6 @@ public class GuardianController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/GuardianElderController.java
View File

@ -19,6 +19,7 @@ import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityGuardianElder;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
import net.minecraft.server.v1_12_R1.SoundEffect;
@ -35,6 +36,11 @@ public class GuardianElderController extends MobEntityController {
}
public static class EntityGuardianElderNPC extends EntityGuardianElder implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private final CitizensNPC npc;
public EntityGuardianElderNPC(World world) {
@ -110,8 +116,6 @@ public class GuardianElderController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseController.java
View File

@ -22,6 +22,7 @@ import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityHorse;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.GenericAttributes;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
@ -45,6 +46,11 @@ public class HorseController extends MobEntityController {
}
public static class EntityHorseNPC extends EntityHorse implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private double baseMovementSpeed;
private final CitizensNPC npc;
@ -144,8 +150,6 @@ public class HorseController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

6
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseDonkeyController.java
View File

@ -22,6 +22,7 @@ import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityHorseDonkey;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.GenericAttributes;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
@ -45,6 +46,11 @@ public class HorseDonkeyController extends MobEntityController {
}
public static class EntityHorseDonkeyNPC extends EntityHorseDonkey implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private double baseMovementSpeed;
private final CitizensNPC npc;
private boolean riding;

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseMuleController.java
View File

@ -22,6 +22,7 @@ import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityHorseMule;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.GenericAttributes;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
@ -45,6 +46,11 @@ public class HorseMuleController extends MobEntityController {
}
public static class EntityHorseMuleNPC extends EntityHorseMule implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private double baseMovementSpeed;
private final CitizensNPC npc;
@ -144,8 +150,6 @@ public class HorseMuleController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

8
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/HorseSkeletonController.java
View File

@ -22,6 +22,7 @@ import net.minecraft.server.v1_12_R1.BlockPosition;
import net.minecraft.server.v1_12_R1.DamageSource;
import net.minecraft.server.v1_12_R1.Entity;
import net.minecraft.server.v1_12_R1.EntityHorseSkeleton;
import net.minecraft.server.v1_12_R1.EnumPistonReaction;
import net.minecraft.server.v1_12_R1.GenericAttributes;
import net.minecraft.server.v1_12_R1.IBlockData;
import net.minecraft.server.v1_12_R1.NBTTagCompound;
@ -45,6 +46,11 @@ public class HorseSkeletonController extends MobEntityController {
}
public static class EntityHorseSkeletonNPC extends EntityHorseSkeleton implements NPCHolder {
@Override
public EnumPistonReaction getPushReaction() {
return Util.callPistonPushEvent(npc) ? EnumPistonReaction.IGNORE : super.getPushReaction();
}
private double baseMovementSpeed;
private final CitizensNPC npc;
@ -145,8 +151,6 @@ public class HorseSkeletonController extends MobEntityController {
}
}
@Override
public void f(double x, double y, double z) {
Vector vector = Util.callPushEvent(npc, x, y, z);

Some files were not shown because too many files have changed in this diff Show More