Skip to content

Commit

Permalink
Fix HorseEquipper
Browse files Browse the repository at this point in the history
  • Loading branch information
fullwall committed Aug 4, 2013
1 parent 5a88c65 commit e39eb49
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/main/java/net/citizensnpcs/editor/HorseEquipper.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
6 changes: 4 additions & 2 deletions src/main/java/net/citizensnpcs/util/NMS.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit e39eb49

Please sign in to comment.