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

Fix horse/llama equipping

This commit is contained in:
fullwall 2018-03-15 16:41:30 +08:00
parent 680af76457
commit 5f062dbb3a
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/java/net/citizensnpcs/editor/HorseEquipper.java
View File

@ -1,7 +1,7 @@
package net.citizensnpcs.editor;
import org.bukkit.entity.Horse;
import org.bukkit.entity.Player;
import org.bukkit.entity.Tameable;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.util.NMS;
@ -9,7 +9,7 @@ import net.citizensnpcs.util.NMS;
public class HorseEquipper implements Equipper {
@Override
public void equip(Player equipper, NPC toEquip) {
Horse horse = (Horse) toEquip.getEntity();
Tameable horse = (Tameable) toEquip.getEntity();
NMS.openHorseScreen(horse, equipper);
}
}

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
View File

@ -699,7 +699,7 @@ public class NMSImpl implements NMSBridge {
return;
boolean wasTamed = horse.isTamed();
horse.setTamed(true);
((EntityHorse) handle).a((EntityHuman) equipperHandle);
((EntityHorse) handle).f((EntityHuman) equipperHandle);
horse.setTamed(wasTamed);
}

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
View File

@ -760,7 +760,7 @@ public class NMSImpl implements NMSBridge {
return;
boolean wasTamed = horse.isTamed();
horse.setTamed(true);
((EntityHorseAbstract) handle).a((EntityHuman) equipperHandle);
((EntityHorseAbstract) handle).f((EntityHuman) equipperHandle);
horse.setTamed(wasTamed);
}

2
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
View File

@ -767,7 +767,7 @@ public class NMSImpl implements NMSBridge {
return;
boolean wasTamed = horse.isTamed();
horse.setTamed(true);
((EntityHorseAbstract) handle).a((EntityHuman) equipperHandle);
((EntityHorseAbstract) handle).c((EntityHuman) equipperHandle);
horse.setTamed(wasTamed);
}