Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-22 02:25:57 +01:00
Code Issues Projects Releases Wiki Activity

Minor shulker fix

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/ShulkerController.java
View File

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

7
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/ShulkerController.java
View File

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

2
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/ShulkerController.java
View File

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

2
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/entity/ShulkerController.java
View File

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

2
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/entity/ShulkerController.java
View File

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

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/ShulkerController.java
View File

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

2
v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/entity/ShulkerController.java
View File

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

2
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/ShulkerController.java
View File

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

2
v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/ShulkerController.java
View File

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

2
v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/ShulkerController.java
View File

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

2
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/entity/ShulkerController.java
View File

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