Minor shulker fix

This commit is contained in:
fullwall 2024-02-05 00:13:42 +08:00
parent 66708ac314
commit f9c4dbe614
11 changed files with 11 additions and 16 deletions

View File

@ -179,7 +179,7 @@ public class ShulkerController extends MobEntityController {
@Override @Override
protected EntityAIBodyControl s() { protected EntityAIBodyControl s() {
return new EntityAIBodyControl(this); return npc == null ? super.s() : new EntityAIBodyControl(this);
} }
@Override @Override

View File

@ -1,7 +1,6 @@
package net.citizensnpcs.nms.v1_11_R1.entity; package net.citizensnpcs.nms.v1_11_R1.entity;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.DyeColor;
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.CraftShulker; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftShulker;
@ -180,11 +179,7 @@ public class ShulkerController extends MobEntityController {
@Override @Override
protected EntityAIBodyControl s() { protected EntityAIBodyControl s() {
return new EntityAIBodyControl(this); return npc == null ? super.s() : new EntityAIBodyControl(this);
}
public void setColor(DyeColor color) {
this.datawatcher.set(bw, color.getWoolData());
} }
@Override @Override

View File

@ -186,7 +186,7 @@ public class ShulkerController extends MobEntityController {
@Override @Override
protected EntityAIBodyControl s() { protected EntityAIBodyControl s() {
return new EntityAIBodyControl(this); return npc == null ? super.s() : new EntityAIBodyControl(this);
} }
@Override @Override

View File

@ -206,7 +206,7 @@ public class ShulkerController extends MobEntityController {
@Override @Override
protected EntityAIBodyControl o() { protected EntityAIBodyControl o() {
return new EntityAIBodyControl(this); return npc == null ? super.o() : new EntityAIBodyControl(this);
} }
@Override @Override

View File

@ -202,7 +202,7 @@ public class ShulkerController extends MobEntityController {
@Override @Override
protected EntityAIBodyControl o() { protected EntityAIBodyControl o() {
return new EntityAIBodyControl(this); return npc == null ? super.o() : new EntityAIBodyControl(this);
} }
@Override @Override

View File

@ -203,7 +203,7 @@ public class ShulkerController extends MobEntityController {
@Override @Override
protected EntityAIBodyControl o() { protected EntityAIBodyControl o() {
return new EntityAIBodyControl(this); return npc == null ? super.o() : new EntityAIBodyControl(this);
} }
@Override @Override

View File

@ -203,7 +203,7 @@ public class ShulkerController extends MobEntityController {
@Override @Override
protected EntityAIBodyControl r() { protected EntityAIBodyControl r() {
return new EntityAIBodyControl(this); return npc == null ? super.r() : new EntityAIBodyControl(this);
} }
@Override @Override

View File

@ -91,7 +91,7 @@ public class ShulkerController extends MobEntityController {
@Override @Override
protected BodyRotationControl createBodyControl() { protected BodyRotationControl createBodyControl() {
return new BodyRotationControl(this); return npc == null ? super.createBodyControl() : new BodyRotationControl(this);
} }
@Override @Override

View File

@ -92,7 +92,7 @@ public class ShulkerController extends MobEntityController {
@Override @Override
protected BodyRotationControl createBodyControl() { protected BodyRotationControl createBodyControl() {
return new BodyRotationControl(this); return npc == null ? super.createBodyControl() : new BodyRotationControl(this);
} }
@Override @Override

View File

@ -93,7 +93,7 @@ public class ShulkerController extends MobEntityController {
@Override @Override
protected BodyRotationControl createBodyControl() { protected BodyRotationControl createBodyControl() {
return new BodyRotationControl(this); return npc == null ? super.createBodyControl() : new BodyRotationControl(this);
} }
@Override @Override

View File

@ -92,7 +92,7 @@ public class ShulkerController extends MobEntityController {
@Override @Override
protected BodyRotationControl createBodyControl() { protected BodyRotationControl createBodyControl() {
return new BodyRotationControl(this); return npc == null ? super.createBodyControl() : new BodyRotationControl(this);
} }
@Override @Override