From e39eb49a0d07ccc0355d3200c8177c544fd2b1f6 Mon Sep 17 00:00:00 2001 From: fullwall Date: Sun, 4 Aug 2013 23:23:08 +0800 Subject: [PATCH] Fix HorseEquipper --- src/main/java/net/citizensnpcs/editor/HorseEquipper.java | 2 +- src/main/java/net/citizensnpcs/util/NMS.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/citizensnpcs/editor/HorseEquipper.java b/src/main/java/net/citizensnpcs/editor/HorseEquipper.java index ae6680a2b..f6c142c39 100644 --- a/src/main/java/net/citizensnpcs/editor/HorseEquipper.java +++ b/src/main/java/net/citizensnpcs/editor/HorseEquipper.java @@ -10,6 +10,6 @@ public class HorseEquipper implements Equipper { @Override public void equip(Player equipper, NPC toEquip) { Horse horse = (Horse) toEquip.getBukkitEntity(); - NMS.equip(horse, equipper); + NMS.openHorseScreen(horse, equipper); } } diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java index 7aa74dd8a..ac9dcdc7a 100644 --- a/src/main/java/net/citizensnpcs/util/NMS.java +++ b/src/main/java/net/citizensnpcs/util/NMS.java @@ -17,6 +17,7 @@ import net.minecraft.server.v1_6_R2.DamageSource; import net.minecraft.server.v1_6_R2.EnchantmentManager; import net.minecraft.server.v1_6_R2.Entity; +import net.minecraft.server.v1_6_R2.EntityHorse; import net.minecraft.server.v1_6_R2.EntityHuman; import net.minecraft.server.v1_6_R2.EntityInsentient; import net.minecraft.server.v1_6_R2.EntityLiving; @@ -40,6 +41,7 @@ import org.bukkit.craftbukkit.v1_6_R2.entity.CraftLivingEntity; import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer; import org.bukkit.entity.EntityType; +import org.bukkit.entity.Horse; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginLoadOrder; @@ -116,8 +118,8 @@ public static void clearGoals(PathfinderGoalSelector... goalSelectors) { } } - public static void equip(LivingEntity entity, Player equipper) { - getHandle(entity).a(NMS.getHandle(equipper)); + public static void openHorseScreen(Horse horse, Player equipper) { + ((EntityHorse) getHandle(horse)).f((EntityHuman) NMS.getHandle(equipper)); } private static Constructor getCustomEntityConstructor(Class clazz, EntityType type) throws SecurityException,