Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-23 19:16:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix horse equipping

Browse Source
This commit is contained in:
fullwall 2014-01-31 11:04:10 +08:00
parent 845ecd1df5
commit d7f483ccf9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/citizensnpcs/util/NMS.java
View File

@ -39,8 +39,8 @@ import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.craftbukkit.v1_7_R1.CraftSound;
import org.bukkit.craftbukkit.v1_7_R1.CraftServer; import org.bukkit.craftbukkit.v1_7_R1.CraftServer;
import org.bukkit.craftbukkit.v1_7_R1.CraftSound;
import org.bukkit.craftbukkit.v1_7_R1.CraftWorld; import org.bukkit.craftbukkit.v1_7_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_7_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_7_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_7_R1.entity.CraftLivingEntity; import org.bukkit.craftbukkit.v1_7_R1.entity.CraftLivingEntity;
@ -174,7 +174,7 @@ public class NMS {
} }
private static Constructor<?> getCustomEntityConstructor(Class<?> clazz, EntityType type) throws SecurityException, private static Constructor<?> getCustomEntityConstructor(Class<?> clazz, EntityType type) throws SecurityException,
NoSuchMethodException { NoSuchMethodException {
Constructor<?> constructor = ENTITY_CONSTRUCTOR_CACHE.get(clazz); Constructor<?> constructor = ENTITY_CONSTRUCTOR_CACHE.get(clazz);
if (constructor == null) { if (constructor == null) {
constructor = clazz.getConstructor(World.class); constructor = clazz.getConstructor(World.class);
@ -287,7 +287,10 @@ public class NMS {
} }
public static void openHorseScreen(Horse horse, Player equipper) { public static void openHorseScreen(Horse horse, Player equipper) {
((EntityHorse) getHandle(horse)).f((EntityHuman) NMS.getHandle(equipper)); boolean wasTamed = horse.isTamed();
horse.setTamed(true);
((EntityHorse) getHandle(horse)).a((EntityHuman) NMS.getHandle(equipper));
horse.setTamed(wasTamed);
} }
public static void registerEntityClass(Class<?> clazz) { public static void registerEntityClass(Class<?> clazz) {