From f5f34572f64ff5a098effcdbc4cb1ad20e6f45e1 Mon Sep 17 00:00:00 2001 From: FatherToast Date: Mon, 27 Jun 2022 11:33:01 -0500 Subject: [PATCH] remove redundant fire immunity calls --- .../specialmobs/common/entity/creeper/FireCreeperEntity.java | 1 - .../common/entity/creeper/LightningCreeperEntity.java | 1 - .../common/entity/enderman/LightningEndermanEntity.java | 1 - .../specialmobs/common/entity/skeleton/FireSkeletonEntity.java | 1 - .../common/entity/skeleton/SpitfireSkeletonEntity.java | 1 - .../specialmobs/common/entity/slime/LemonSlimeEntity.java | 1 - .../specialmobs/common/entity/slime/StrawberrySlimeEntity.java | 1 - .../entity/witherskeleton/SpitfireWitherSkeletonEntity.java | 1 - .../entity/witherskeleton/_SpecialWitherSkeletonEntity.java | 1 - .../specialmobs/common/entity/zombie/FireZombieEntity.java | 1 - 10 files changed, 10 deletions(-) diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/FireCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/FireCreeperEntity.java index 1d2616f..1865b85 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/FireCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/FireCreeperEntity.java @@ -49,7 +49,6 @@ public class FireCreeperEntity extends _SpecialCreeperEntity { public FireCreeperEntity( EntityType entityType, World world ) { super( entityType, world ); getSpecialData().setDamagedByWater( true ); - getSpecialData().setImmuneToFire( true ); setCannotExplodeWhileWet( true ); xpReward += 1; } diff --git a/src/main/java/fathertoast/specialmobs/common/entity/creeper/LightningCreeperEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/creeper/LightningCreeperEntity.java index c6766dd..ac8c39d 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/creeper/LightningCreeperEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/creeper/LightningCreeperEntity.java @@ -47,7 +47,6 @@ public class LightningCreeperEntity extends _SpecialCreeperEntity { @SpecialMob.Constructor public LightningCreeperEntity( EntityType entityType, World world ) { super( entityType, world ); - getSpecialData().setImmuneToFire( true ); xpReward += 1; } diff --git a/src/main/java/fathertoast/specialmobs/common/entity/enderman/LightningEndermanEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/enderman/LightningEndermanEntity.java index b17f684..98719eb 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/enderman/LightningEndermanEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/enderman/LightningEndermanEntity.java @@ -49,7 +49,6 @@ public class LightningEndermanEntity extends _SpecialEndermanEntity { @SpecialMob.Constructor public LightningEndermanEntity( EntityType entityType, World world ) { super( entityType, world ); - getSpecialData().setImmuneToFire( true ); xpReward += 2; } diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/FireSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/FireSkeletonEntity.java index 10cb43d..da5c5ba 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/FireSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/FireSkeletonEntity.java @@ -50,7 +50,6 @@ public class FireSkeletonEntity extends _SpecialSkeletonEntity { @SpecialMob.Constructor public FireSkeletonEntity( EntityType entityType, World world ) { super( entityType, world ); - getSpecialData().setImmuneToFire( true ); getSpecialData().setDamagedByWater( true ); xpReward += 1; } diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/SpitfireSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/SpitfireSkeletonEntity.java index 7ea8c6e..6fd04c2 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/SpitfireSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/SpitfireSkeletonEntity.java @@ -59,7 +59,6 @@ public class SpitfireSkeletonEntity extends _SpecialSkeletonEntity { public SpitfireSkeletonEntity( EntityType entityType, World world ) { super( entityType, world ); getSpecialData().setBaseScale( 1.5F ); - getSpecialData().setImmuneToFire( true ); getSpecialData().setDamagedByWater( true ); maxUpStep = 1.0F; xpReward += 2; diff --git a/src/main/java/fathertoast/specialmobs/common/entity/slime/LemonSlimeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/slime/LemonSlimeEntity.java index 7e021d3..8abf366 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/slime/LemonSlimeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/slime/LemonSlimeEntity.java @@ -55,7 +55,6 @@ public class LemonSlimeEntity extends _SpecialSlimeEntity { @SpecialMob.Constructor public LemonSlimeEntity( EntityType entityType, World world ) { super( entityType, world ); - getSpecialData().setImmuneToFire( true ); slimeExperienceValue += 2; } diff --git a/src/main/java/fathertoast/specialmobs/common/entity/slime/StrawberrySlimeEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/slime/StrawberrySlimeEntity.java index ecc4b9b..9afdd08 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/slime/StrawberrySlimeEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/slime/StrawberrySlimeEntity.java @@ -58,7 +58,6 @@ public class StrawberrySlimeEntity extends _SpecialSlimeEntity { @SpecialMob.Constructor public StrawberrySlimeEntity( EntityType entityType, World world ) { super( entityType, world ); - getSpecialData().setImmuneToFire( true ); getSpecialData().setDamagedByWater( true ); slimeExperienceValue += 1; diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/SpitfireWitherSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/SpitfireWitherSkeletonEntity.java index 78ef230..4ab1faa 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/SpitfireWitherSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/SpitfireWitherSkeletonEntity.java @@ -58,7 +58,6 @@ public class SpitfireWitherSkeletonEntity extends _SpecialWitherSkeletonEntity { public SpitfireWitherSkeletonEntity( EntityType entityType, World world ) { super( entityType, world ); getSpecialData().setBaseScale( 1.5F ); - getSpecialData().setImmuneToFire( true ); getSpecialData().setDamagedByWater( true ); maxUpStep = 1.0F; xpReward += 2; diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/_SpecialWitherSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/_SpecialWitherSkeletonEntity.java index a74d47d..414cdbc 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/_SpecialWitherSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/_SpecialWitherSkeletonEntity.java @@ -81,7 +81,6 @@ public class _SpecialWitherSkeletonEntity extends WitherSkeletonEntity implement public _SpecialWitherSkeletonEntity( EntityType entityType, World world ) { super( entityType, world ); getSpecialData().initialize(); - getSpecialData().setImmuneToFire( true ); } diff --git a/src/main/java/fathertoast/specialmobs/common/entity/zombie/FireZombieEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/zombie/FireZombieEntity.java index 1bf6d23..bee21e2 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/zombie/FireZombieEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/zombie/FireZombieEntity.java @@ -53,7 +53,6 @@ public class FireZombieEntity extends _SpecialZombieEntity { @SpecialMob.Constructor public FireZombieEntity( EntityType entityType, World world ) { super( entityType, world ); - getSpecialData().setImmuneToFire( true ); getSpecialData().setDamagedByWater( true ); xpReward += 1; }