Solve merge conflicts?
This commit is contained in:
parent
47e7cad9e9
commit
0bec104bf6
1 changed files with 1 additions and 1 deletions
|
@ -512,7 +512,7 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
|
||||||
{
|
{
|
||||||
if(AlchemicalWizardry.causeHungerChatMessage && !player.isPotionActive(Potion.hunger.id))
|
if(AlchemicalWizardry.causeHungerChatMessage && !player.isPotionActive(Potion.hunger.id))
|
||||||
{
|
{
|
||||||
player.addChatComponentMessage(new ChatComponentTranslation("message.altar.hunger"));
|
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("message.altar.hunger")));
|
||||||
}
|
}
|
||||||
player.addPotionEffect(new PotionEffect(Potion.hunger.id, 40, regenEffect.getAmplifier() * 2 - 2));
|
player.addPotionEffect(new PotionEffect(Potion.hunger.id, 40, regenEffect.getAmplifier() * 2 - 2));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue