Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-28 18:21:19 +01:00
Code Issues Projects Releases Wiki Activity

Fix ghast not updating

Browse Source
This commit is contained in:
fullwall 2015-04-05 17:30:25 +08:00
parent 98b2f274fc
commit f64b40ad02
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/net/citizensnpcs/npc/entity/GhastController.java
View File

@ -1,5 +1,12 @@
package net.citizensnpcs.npc.entity; package net.citizensnpcs.npc.entity;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_8_R2.CraftServer;
import org.bukkit.craftbukkit.v1_8_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_8_R2.entity.CraftGhast;
import org.bukkit.entity.Ghast;
import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent; import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensNPC; import net.citizensnpcs.npc.CitizensNPC;
@ -11,13 +18,6 @@ import net.minecraft.server.v1_8_R2.EntityGhast;
import net.minecraft.server.v1_8_R2.NBTTagCompound; import net.minecraft.server.v1_8_R2.NBTTagCompound;
import net.minecraft.server.v1_8_R2.World; import net.minecraft.server.v1_8_R2.World;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_8_R2.CraftServer;
import org.bukkit.craftbukkit.v1_8_R2.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_8_R2.entity.CraftGhast;
import org.bukkit.entity.Ghast;
import org.bukkit.util.Vector;
public class GhastController extends MobEntityController { public class GhastController extends MobEntityController {
public GhastController() { public GhastController() {
super(EntityGhastNPC.class); super(EntityGhastNPC.class);
@ -43,6 +43,11 @@ public class GhastController extends MobEntityController {
} }
} }
@Override
public boolean bM() {
return npc != null;
}
@Override @Override
protected String bo() { protected String bo() {
return npc == null ? super.bo() : npc.data().get(NPC.HURT_SOUND_METADATA, super.bo()); return npc == null ? super.bo() : npc.data().get(NPC.HURT_SOUND_METADATA, super.bo());
@ -87,6 +92,14 @@ public class GhastController extends MobEntityController {
} }
} }
@Override
public void E() {
if (npc != null) {
npc.update();
}
super.E();
}
@Override @Override
public void g(double x, double y, double z) { public void g(double x, double y, double z) {
if (npc == null) { if (npc == null) {
@ -123,8 +136,8 @@ public class GhastController extends MobEntityController {
@Override @Override
protected String z() { protected String z() {
return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.z() : npc.data().get( return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.z()
NPC.AMBIENT_SOUND_METADATA, super.z()); : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.z());
} }
} }