Default values for blaze and illusioner

Faboslav · Dec 1, 2023 · 92d1823 · 92d1823
1 parent e6ee43c
commit 92d1823
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/common/src/main/java/com/faboslav/friendsandfoes/mixin/BlazeEntityMixin.java b/common/src/main/java/com/faboslav/friendsandfoes/mixin/BlazeEntityMixin.java
@@ -22,7 +22,7 @@ public abstract class BlazeEntityMixin extends BlazeLivingEntityMixin implements
 {
 	private static final String WILDFIRE_UUID_NBT_NAME = "WildfireUuid";
 
-	private Optional<UUID> friendsandfoes_wildfireUuid;
+	private Optional<UUID> friendsandfoes_wildfireUuid = Optional.empty();
 
 	protected BlazeEntityMixin(EntityType<? extends HostileEntity> entityType, World world) {
 		super(entityType, world);
@@ -57,7 +57,7 @@ public void friendsandfoes_onDeath(DamageSource damageSource, CallbackInfo ci) {
 
 	@Nullable
 	public UUID friendsandfoes_getWildfireUuid() {
-		return (UUID) ((Optional) this.friendsandfoes_wildfireUuid).orElse(null);
+		return this.friendsandfoes_wildfireUuid.orElse(null);
 	}
 
 	public void friendsandfoes_setWildfireUuid(@Nullable UUID uuid) {

diff --git a/common/src/main/java/com/faboslav/friendsandfoes/mixin/IllusionerEntityMixin.java b/common/src/main/java/com/faboslav/friendsandfoes/mixin/IllusionerEntityMixin.java
@@ -50,11 +50,11 @@ public abstract class IllusionerEntityMixin extends IllusionerSpellcastingIllage
 	private static final String TICKS_UNTIL_DESPAWN_NBT_NAME = "TicksUntilDespawn";
 	private static final String TICKS_UNTIL_CAN_CREATE_ILLUSIONS_NBT_NAME = "TicksUntilCanCreateIllusions";
 
-	private IllusionerEntity friendsandfoes_illusioner;
-	private boolean friendsandfoes_isIllusion;
-	private boolean friendsandfoes_wasAttacked;
-	private int friendsandfoes_ticksUntilDespawn;
-	private int friendsandfoes_ticksUntilCanCreateIllusion;
+	private IllusionerEntity friendsandfoes_illusioner = null;
+	private boolean friendsandfoes_isIllusion = false;
+	private boolean friendsandfoes_wasAttacked = false;
+	private int friendsandfoes_ticksUntilDespawn = 0;
+	private int friendsandfoes_ticksUntilCanCreateIllusion = 0;
 
 	protected IllusionerEntityMixin(
 		EntityType<? extends SpellcastingIllagerEntity> entityType,