lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed crash on death for servers

Browse source 
Fixed an issue where the client would crash when you died by the Sacrificial Knife when on a server.
This commit is contained in:
WayofTime 2020-10-26 16:08:04 -04:00
parent ec1b0644cb
commit 152525bbe3
6 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/WayofTime/bloodmagic/util/DamageSourceBloodMagic.java
View file

@ -3,8 +3,7 @@ package wayoftime.bloodmagic.util;
import net.minecraft.entity.LivingEntity;
import net.minecraft.util.DamageSource;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.StringTextComponent;
import wayoftime.bloodmagic.util.helper.TextHelper;
import net.minecraft.util.text.TranslationTextComponent;
public class DamageSourceBloodMagic extends DamageSource
{
@ -21,6 +20,6 @@ public class DamageSourceBloodMagic extends DamageSource
@Override
public ITextComponent getDeathMessage(LivingEntity livingBase)
{
return new StringTextComponent(TextHelper.localizeEffect("chat.bloodmagic.damageSource", livingBase.getName()));
return new TranslationTextComponent("chat.bloodmagic.damageSource", livingBase.getName());
}
}

2
src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java
View file

@ -19,6 +19,8 @@ public class GeneratorLanguage extends LanguageProvider
// Creative Tab
add("itemGroup.bloodmagic.creativeTab", "Blood Magic");
add("chat.bloodmagic.damageSource", "%s's soul became too weak");
// Tile Entitites
add("tile.bloodmagic.soulforge.name", "Hellfire Forge");

2
src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java
View file

@ -102,7 +102,7 @@ public class ItemSacrificialDagger extends Item
player.hurtResistantTime = 0;
player.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 0.001F);
player.setHealth(Math.max(player.getHealth() - 1.998F, 0.0001f));
if (player.getHealth() <= 0.001f)
if (player.getHealth() <= 0.001f && !world.isRemote)
{
player.onDeath(DamageSourceBloodMagic.INSTANCE);
player.setHealth(0);