From 15ab3b8cf98f836b88a3562ff13965054ba4e725 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Jul 2018 22:36:31 -0500 Subject: [PATCH] SkeletonHorse Additions diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java index e643201ebf..edd272eabd 100644 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { private final PathfinderGoalHorseTrap bM = new PathfinderGoalHorseTrap(this); private boolean bN; - private int bO; + private int bO; public int getTrapTime() { return this.bO; } // Paper - OBFHELPER public EntityHorseSkeleton(World world) { super(EntityTypes.SKELETON_HORSE, world); @@ -114,10 +114,12 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { return 0.96F; } + public boolean isTrap() { return this.dy(); } // Paper - OBFHELPER public boolean dy() { return this.bN; } + public void setTrap(boolean trap) { this.s(trap); } // Paper - OBFHELPER public void s(boolean flag) { if (flag != this.bN) { this.bN = flag; diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java index 82403c8165..2ee91bbb02 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java @@ -13,6 +13,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal { } public void e() { + if (!new com.destroystokyo.paper.event.entity.SkeletonHorseTrapEvent((org.bukkit.entity.SkeletonHorse) this.a.getBukkitEntity()).callEvent()) return; // Paper DifficultyDamageScaler difficultydamagescaler = this.a.world.getDamageScaler(new BlockPosition(this.a)); this.a.s(false); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java index e822c2200d..496d0c0cac 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java @@ -26,4 +26,23 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo public Variant getVariant() { return Variant.SKELETON_HORSE; } + + // Paper start + @Override + public EntityHorseSkeleton getHandle() { + return (EntityHorseSkeleton) super.getHandle(); + } + + public int getTrapTime() { + return getHandle().getTrapTime(); + } + + public boolean isTrap() { + return getHandle().isTrap(); + } + + public void setTrap(boolean trap) { + getHandle().setTrap(trap); + } + // Paper end } -- 2.18.0