Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-30 08:08:12 +02:00
Code Issues Projects Releases Wiki Activity

Fix horse subclasses

Browse Source
This commit is contained in:
fullwall 2016-12-14 16:19:59 +08:00
parent afb7e13ee6
commit 728930a09f
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseDonkeyController.java
View File

@ -6,7 +6,6 @@ import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftDonkey; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftDonkey;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity;
import org.bukkit.entity.Donkey; import org.bukkit.entity.Donkey;
import org.bukkit.entity.Horse;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCEnderTeleportEvent; import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
@ -37,7 +36,7 @@ public class HorseDonkeyController extends MobEntityController {
@Override @Override
public void spawn(Location at, NPC npc) { public void spawn(Location at, NPC npc) {
npc.getTrait(HorseModifiers.class); npc.addTrait(HorseModifiers.class);
super.spawn(at, npc); super.spawn(at, npc);
} }
@ -53,7 +52,7 @@ public class HorseDonkeyController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
if (npc != null) { if (npc != null) {
NMSImpl.clearGoals(goalSelector, targetSelector); NMSImpl.clearGoals(goalSelector, targetSelector);
((Horse) getBukkitEntity()).setDomestication(((Horse) getBukkitEntity()).getMaxDomestication()); ((Donkey) getBukkitEntity()).setDomestication(((Donkey) getBukkitEntity()).getMaxDomestication());
} }
} }

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseMuleController.java
View File

@ -5,7 +5,6 @@ import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_11_R1.CraftServer; import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftMule; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftMule;
import org.bukkit.entity.Horse;
import org.bukkit.entity.Mule; import org.bukkit.entity.Mule;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -53,7 +52,7 @@ public class HorseMuleController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
if (npc != null) { if (npc != null) {
NMSImpl.clearGoals(goalSelector, targetSelector); NMSImpl.clearGoals(goalSelector, targetSelector);
((Horse) getBukkitEntity()).setDomestication(((Horse) getBukkitEntity()).getMaxDomestication()); ((Mule) getBukkitEntity()).setDomestication(((Mule) getBukkitEntity()).getMaxDomestication());
} }
} }

4
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseSkeletonController.java
View File

@ -5,7 +5,6 @@ import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_11_R1.CraftServer; import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftSkeletonHorse; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftSkeletonHorse;
import org.bukkit.entity.Horse;
import org.bukkit.entity.SkeletonHorse; import org.bukkit.entity.SkeletonHorse;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -53,7 +52,8 @@ public class HorseSkeletonController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
if (npc != null) { if (npc != null) {
NMSImpl.clearGoals(goalSelector, targetSelector); NMSImpl.clearGoals(goalSelector, targetSelector);
((Horse) getBukkitEntity()).setDomestication(((Horse) getBukkitEntity()).getMaxDomestication()); ((SkeletonHorse) getBukkitEntity())
.setDomestication(((SkeletonHorse) getBukkitEntity()).getMaxDomestication());
} }
} }

4
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/HorseZombieController.java
View File

@ -5,7 +5,6 @@ import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_11_R1.CraftServer; import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftZombieHorse; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftZombieHorse;
import org.bukkit.entity.Horse;
import org.bukkit.entity.ZombieHorse; import org.bukkit.entity.ZombieHorse;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -53,7 +52,8 @@ public class HorseZombieController extends MobEntityController {
this.npc = (CitizensNPC) npc; this.npc = (CitizensNPC) npc;
if (npc != null) { if (npc != null) {
NMSImpl.clearGoals(goalSelector, targetSelector); NMSImpl.clearGoals(goalSelector, targetSelector);
((Horse) getBukkitEntity()).setDomestication(((Horse) getBukkitEntity()).getMaxDomestication()); ((ZombieHorse) getBukkitEntity())
.setDomestication(((ZombieHorse) getBukkitEntity()).getMaxDomestication());
} }
} }