From db637a05370ed1239ca8a9b25be697fcdc40a2b9 Mon Sep 17 00:00:00 2001 From: SamB440 Date: Mon, 27 Mar 2023 15:01:36 +0100 Subject: [PATCH] Don't allow guild master to be damaged --- .../common/entity/guild/GuildMasterEntity.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/convallyria/taleofkingdoms/common/entity/guild/GuildMasterEntity.java b/src/main/java/com/convallyria/taleofkingdoms/common/entity/guild/GuildMasterEntity.java index 9228930f..721d3c76 100644 --- a/src/main/java/com/convallyria/taleofkingdoms/common/entity/guild/GuildMasterEntity.java +++ b/src/main/java/com/convallyria/taleofkingdoms/common/entity/guild/GuildMasterEntity.java @@ -3,9 +3,9 @@ import com.convallyria.taleofkingdoms.TaleOfKingdoms; import com.convallyria.taleofkingdoms.TaleOfKingdomsAPI; import com.convallyria.taleofkingdoms.client.gui.entity.GuildMasterScreen; +import com.convallyria.taleofkingdoms.common.entity.EntityTypes; import com.convallyria.taleofkingdoms.common.entity.TOKEntity; import com.convallyria.taleofkingdoms.common.world.ConquestInstance; -import com.convallyria.taleofkingdoms.server.world.ServerConquestInstance; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; @@ -13,6 +13,7 @@ import net.minecraft.entity.ai.goal.LookAtEntityGoal; import net.minecraft.entity.attribute.DefaultAttributeContainer; import net.minecraft.entity.attribute.EntityAttributes; +import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.mob.PathAwareEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.network.ServerPlayerEntity; @@ -71,6 +72,11 @@ public boolean isFireImmune() { return false; } + @Override + public boolean damage(DamageSource damageSource, float f) { + return !this.getType().equals(EntityTypes.GUILDMASTER); + } + @Override public boolean isStationary() { return true;