Fix recursive converted creature name method. Closes #975

Remove unused skill desc
TeamLapen · Aug 30, 2021 · 5761a9e · 5761a9e
1 parent ac6c4d2
commit 5761a9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/de/teamlapen/vampirism/entity/converted/ConvertedCreatureEntity.java b/src/main/java/de/teamlapen/vampirism/entity/converted/ConvertedCreatureEntity.java
@@ -144,7 +144,7 @@ public DataParameter<Boolean> getConvertingDataParam() {
     @Override
     protected ITextComponent getTypeName() {
         if (name == null) {
-            this.name = new TranslationTextComponent("entity.vampirism.vampire").append(" ").append((nil() ? super.getName() : entityCreature.getName()));
+            this.name = new TranslationTextComponent("entity.vampirism.vampire").append(" ").append((nil() ? super.getTypeName() : entityCreature.getName()));
         }
         return name;
     }

diff --git a/src/main/java/de/teamlapen/vampirism/player/hunter/skills/HunterSkills.java b/src/main/java/de/teamlapen/vampirism/player/hunter/skills/HunterSkills.java
@@ -71,7 +71,7 @@ public static void registerHunterSkills(IForgeRegistry<ISkill> registry) {
         registry.register(new VampirismSkill.SimpleHunterSkill("hunter_attack_speed_advanced", true).registerAttributeModifier(Attributes.ATTACK_SPEED, "d9311f44-a4ba-4ef4-83f2-9274ae1a827e", () -> VampirismConfig.BALANCE.hsMajorAttackSpeedModifier.get(), AttributeModifier.Operation.MULTIPLY_TOTAL));
         //Config null, so cannot get method ref
         //noinspection Convert2MethodRef
-        registry.register(new VampirismSkill.SimpleHunterSkill("hunter_attack_damage", true).registerAttributeModifier(Attributes.ATTACK_DAMAGE, "ffafd115-96e2-4d08-9588-d1bc9be0d902", () -> VampirismConfig.BALANCE.hsSmallAttackDamageModifier.get(), AttributeModifier.Operation.ADDITION));
+        registry.register(new VampirismSkill.SimpleHunterSkill("hunter_attack_damage", false).registerAttributeModifier(Attributes.ATTACK_DAMAGE, "ffafd115-96e2-4d08-9588-d1bc9be0d902", () -> VampirismConfig.BALANCE.hsSmallAttackDamageModifier.get(), AttributeModifier.Operation.ADDITION));
         registry.register(new ActionSkill<IHunterPlayer>("hunter_awareness", HunterActions.awareness_hunter, true));
         registry.register(new ActionSkill<IHunterPlayer>("hunter_disguise", HunterActions.disguise_hunter, true));
         registry.register(new VampirismSkill.SimpleHunterSkill("purified_garlic", true));