From 888b3235eabf6fdad1aba9d50062ada95248acac Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 12 Mar 2020 20:11:38 -0500 Subject: [PATCH] Only generate mana from items on server side. Might fix #3195 --- .../item/equipment/armor/terrasteel/ItemTerrasteelHelm.java | 2 +- .../botania/common/item/equipment/bauble/ItemAuraRing.java | 2 +- .../common/item/equipment/bauble/ItemGreaterAuraRing.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index dae81c022..34bdb0e68 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -53,7 +53,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc @Override public void onArmorTick(ItemStack stack, World world, PlayerEntity player) { super.onArmorTick(stack, world, player); - if(hasArmorSet(player)) { + if(!world.isRemote && hasArmorSet(player)) { int food = player.getFoodStats().getFoodLevel(); if(food > 0 && food < 18 && player.shouldHeal() && player.ticksExisted % 80 == 0) player.heal(1F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java index f0c42ea90..d3824d05e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java @@ -24,7 +24,7 @@ public class ItemAuraRing extends ItemBauble implements IManaGivingItem { @Override public void onWornTick(ItemStack stack, LivingEntity player) { - if (player instanceof PlayerEntity && player.ticksExisted % 10 == 0) + if (!player.world.isRemote && player instanceof PlayerEntity && player.ticksExisted % 10 == 0) ManaItemHandler.dispatchManaExact(stack, (PlayerEntity) player, 1, true); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java index 344c51107..80890da4e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java @@ -24,7 +24,7 @@ public class ItemGreaterAuraRing extends ItemBauble implements IManaGivingItem { @Override public void onWornTick(ItemStack stack, LivingEntity player) { - if (player instanceof PlayerEntity && player.ticksExisted % 2 == 0) + if (!player.world.isRemote && player instanceof PlayerEntity && player.ticksExisted % 2 == 0) ManaItemHandler.dispatchManaExact(stack, (PlayerEntity) player, 1, true); } }