diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PitchableLookControl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PitchableLookControl.java index d36ba5203..f1d51d7b6 100644 --- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PitchableLookControl.java +++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PitchableLookControl.java @@ -8,16 +8,15 @@ import net.minecraft.server.v1_14_R1.ControllerLook; import net.minecraft.server.v1_14_R1.EntityInsentient; public class PitchableLookControl extends ControllerLook { - private boolean explicit = true; private final Supplier resetOnTick; public PitchableLookControl(EntityInsentient var0) { super(var0); if (var0 instanceof NPCHolder) { NPC npc = ((NPCHolder) var0).getNPC(); - resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, explicit); + resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, false); } else { - resetOnTick = () -> explicit; + resetOnTick = () -> true; } } @@ -25,8 +24,4 @@ public class PitchableLookControl extends ControllerLook { public boolean b() { return resetOnTick.get(); } - - public void setResetXRotOnTick(boolean val) { - explicit = val; - } } \ No newline at end of file diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PitchableLookControl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PitchableLookControl.java index bebe3bed6..76c4c31d3 100644 --- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PitchableLookControl.java +++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PitchableLookControl.java @@ -8,16 +8,15 @@ import net.minecraft.server.v1_15_R1.ControllerLook; import net.minecraft.server.v1_15_R1.EntityInsentient; public class PitchableLookControl extends ControllerLook { - private boolean explicit = true; private final Supplier resetOnTick; public PitchableLookControl(EntityInsentient var0) { super(var0); if (var0 instanceof NPCHolder) { NPC npc = ((NPCHolder) var0).getNPC(); - resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, explicit); + resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, false); } else { - resetOnTick = () -> explicit; + resetOnTick = () -> true; } } @@ -25,8 +24,4 @@ public class PitchableLookControl extends ControllerLook { public boolean b() { return resetOnTick.get(); } - - public void setResetXRotOnTick(boolean val) { - explicit = val; - } } \ No newline at end of file diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PitchableLookControl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PitchableLookControl.java index c0b054629..24bca6353 100644 --- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PitchableLookControl.java +++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PitchableLookControl.java @@ -8,16 +8,15 @@ import net.minecraft.server.v1_16_R3.ControllerLook; import net.minecraft.server.v1_16_R3.EntityInsentient; public class PitchableLookControl extends ControllerLook { - private boolean explicit = true; private final Supplier resetOnTick; public PitchableLookControl(EntityInsentient var0) { super(var0); if (var0 instanceof NPCHolder) { NPC npc = ((NPCHolder) var0).getNPC(); - resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, explicit); + resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, false); } else { - resetOnTick = () -> explicit; + resetOnTick = () -> true; } } @@ -25,8 +24,4 @@ public class PitchableLookControl extends ControllerLook { public boolean b() { return resetOnTick.get(); } - - public void setResetXRotOnTick(boolean val) { - explicit = val; - } } \ No newline at end of file diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PitchableLookControl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PitchableLookControl.java index af5da7ffb..d555ca85a 100644 --- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PitchableLookControl.java +++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PitchableLookControl.java @@ -8,16 +8,15 @@ import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.ai.control.LookControl; public class PitchableLookControl extends LookControl { - private boolean explicit = true; private final Supplier resetOnTick; public PitchableLookControl(Mob var0) { super(var0); if (var0 instanceof NPCHolder) { NPC npc = ((NPCHolder) var0).getNPC(); - resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, explicit); + resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, false); } else { - resetOnTick = () -> explicit; + resetOnTick = () -> true; } } @@ -25,8 +24,4 @@ public class PitchableLookControl extends LookControl { public boolean resetXRotOnTick() { return resetOnTick.get(); } - - public void setResetXRotOnTick(boolean val) { - explicit = val; - } } \ No newline at end of file diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PitchableLookControl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PitchableLookControl.java index f62d4f001..8e1981a32 100644 --- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PitchableLookControl.java +++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/PitchableLookControl.java @@ -8,16 +8,15 @@ import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.ai.control.LookControl; public class PitchableLookControl extends LookControl { - private boolean explicit = true; private final Supplier resetOnTick; public PitchableLookControl(Mob var0) { super(var0); if (var0 instanceof NPCHolder) { NPC npc = ((NPCHolder) var0).getNPC(); - resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, explicit); + resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, false); } else { - resetOnTick = () -> explicit; + resetOnTick = () -> true; } } @@ -25,8 +24,4 @@ public class PitchableLookControl extends LookControl { public boolean resetXRotOnTick() { return resetOnTick.get(); } - - public void setResetXRotOnTick(boolean val) { - explicit = val; - } } \ No newline at end of file diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java index ff9a70d41..a41c62a0d 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/entity/AllayController.java @@ -59,7 +59,6 @@ public class AllayController extends MobEntityController { public static class EntityAllayNPC extends Allay implements NPCHolder { private final CitizensNPC npc; - private int taskId = -1; public EntityAllayNPC(EntityType types, Level level) { diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java index 0f2065d30..fec6d33dc 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java @@ -1197,8 +1197,9 @@ public class NMSImpl implements NMSBridge { changed = true; } MirrorTrait trait = npc.getTraitNullable(MirrorTrait.class); - if (trait == null || !trait.isMirroring(player)) + if (trait == null || !trait.isMirroring(player)) { continue; + } GameProfile profile = NMS.getProfile(player); if (trait.mirrorName()) { list.set(i, diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/PitchableLookControl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/PitchableLookControl.java index 0f8d24385..6b86c84c2 100644 --- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/PitchableLookControl.java +++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/PitchableLookControl.java @@ -8,16 +8,15 @@ import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.ai.control.LookControl; public class PitchableLookControl extends LookControl { - private boolean explicit = true; private final Supplier resetOnTick; public PitchableLookControl(Mob var0) { super(var0); if (var0 instanceof NPCHolder) { NPC npc = ((NPCHolder) var0).getNPC(); - resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, explicit); + resetOnTick = () -> npc.data().get(NPC.Metadata.RESET_PITCH_ON_TICK, false); } else { - resetOnTick = () -> explicit; + resetOnTick = () -> true; } } @@ -25,8 +24,4 @@ public class PitchableLookControl extends LookControl { public boolean resetXRotOnTick() { return resetOnTick.get(); } - - public void setResetXRotOnTick(boolean val) { - explicit = val; - } } \ No newline at end of file