Fix reach ring (#64)

Co-authored-by: Shadow1590 <>
GTNewHorizons · Dec 7, 2024 · 13d5384 · 13d5384
1 parent 909cc50
commit 13d5384
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java
@@ -39,6 +39,7 @@
 public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAttachable, IPhantomInkable, IRunicArmor {
 
 	private static final String TAG_HASHCODE = "playerHashcode";
+	private static final String TAG_HASHCODE_CLIENT = "playerHashcodeClient";
 	private static final String TAG_BAUBLE_UUID_MOST = "baubleUUIDMost";
 	private static final String TAG_BAUBLE_UUID_LEAST = "baubleUUIDLeast";
 	private static final String TAG_COSMETIC_ITEM = "cosmeticItem";
@@ -122,9 +123,9 @@ public boolean canUnequip(ItemStack stack, EntityLivingBase player) {
 
 	@Override
 	public void onWornTick(ItemStack stack, EntityLivingBase player) {
-		if(getLastPlayerHashcode(stack) != player.hashCode()) {
+		if(getLastPlayerHashcode(stack, player.worldObj.isRemote) != player.hashCode()) {
 			onEquippedOrLoadedIntoWorld(stack, player);
-			setLastPlayerHashcode(stack, player.hashCode());
+			setLastPlayerHashcode(stack, player.hashCode(), player.worldObj.isRemote);
 		}
 	}
 
@@ -138,7 +139,7 @@ public void onEquipped(ItemStack stack, EntityLivingBase player) {
 				((EntityPlayer) player).addStat(ModAchievements.baubleWear, 1);
 
 			onEquippedOrLoadedIntoWorld(stack, player);
-			setLastPlayerHashcode(stack, player.hashCode());
+			setLastPlayerHashcode(stack, player.hashCode(), player.worldObj.isRemote);
 		}
 	}
 
@@ -195,12 +196,12 @@ public static UUID getBaubleUUID(ItemStack stack) {
 		return new UUID(most, least);
 	}
 
-	public static int getLastPlayerHashcode(ItemStack stack) {
-		return ItemNBTHelper.getInt(stack, TAG_HASHCODE, 0);
+	public static int getLastPlayerHashcode(ItemStack stack, boolean remote) {
+		return ItemNBTHelper.getInt(stack, remote ? TAG_HASHCODE_CLIENT : TAG_HASHCODE, 0);
 	}
 
-	public static void setLastPlayerHashcode(ItemStack stack, int hash) {
-		ItemNBTHelper.setInt(stack, TAG_HASHCODE, hash);
+	public static void setLastPlayerHashcode(ItemStack stack, int hash, boolean remote) {
+		ItemNBTHelper.setInt(stack, remote ? TAG_HASHCODE_CLIENT : TAG_HASHCODE, hash);
 	}
 
 	@Override