From 4e3db62e782d9c5253b87a6ae7b3af4e79bef3cd Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Mon, 4 May 2020 00:41:36 +0200
Subject: [PATCH] Fixed the alicorn amulet

---
 .../entity/player/PlayerInventory.java        |  5 +--
 .../unicopia/item/AlicornAmuletItem.java      | 32 +++++++++++++------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerInventory.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerInventory.java
index cf9bdb66..630f2f9a 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerInventory.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerInventory.java
@@ -5,6 +5,7 @@ import java.util.Map;
 
 import com.google.common.collect.Maps;
 import com.minelittlepony.unicopia.entity.Updatable;
+import com.minelittlepony.unicopia.item.MagicGemItem;
 import com.minelittlepony.unicopia.magic.AddictiveMagicalItem;
 import com.minelittlepony.unicopia.magic.MagicalItem;
 import com.minelittlepony.unicopia.util.NbtSerialisable;
@@ -92,7 +93,7 @@ public class PlayerInventory implements Updatable, NbtSerialisable {
             }
         }
 
-        return item instanceof Item;
+        return item instanceof MagicGemItem;
     }
 
     public boolean matches(Tag<Item> tag) {
@@ -155,7 +156,7 @@ public class PlayerInventory implements Updatable, NbtSerialisable {
             if (isWearing(item)) {
                 ticksAttached ++;
                 needfulness *= 0.9F;
-            } else {
+            } else if (ticksAttached > 0) {
                 item.onRemoved(player, needfulness);
                 needfulness = 0;
             }
diff --git a/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java b/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java
index 992467dd..9c41527a 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java
@@ -17,6 +17,8 @@ import com.minelittlepony.unicopia.util.MagicalDamageSource;
 import com.minelittlepony.unicopia.util.VecHelper;
 
 import net.minecraft.util.ChatUtil;
+import net.minecraft.util.Hand;
+import net.minecraft.util.TypedActionResult;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
@@ -41,8 +43,6 @@ import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.ActionResult;
-import net.minecraft.util.Hand;
-import net.minecraft.util.TypedActionResult;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.LocalDifficulty;
 import net.minecraft.world.World;
@@ -75,8 +75,8 @@ public class AlicornAmuletItem extends ArmorItem implements AddictiveMagicalItem
         World world = entity.world;
 
         double x = entity.getX() + world.random.nextFloat() - 0.5;
-        double z = entity.getY() + world.random.nextFloat() - 0.5;
-        double y = entity.getZ() + world.random.nextFloat();
+        double y = entity.getY() + world.random.nextFloat() - 0.5;
+        double z = entity.getZ() + world.random.nextFloat() - 0.5;
 
         ParticleEffect particle = world.random.nextBoolean() ? ParticleTypes.LARGE_SMOKE : ParticleTypes.FLAME;
 
@@ -87,7 +87,7 @@ public class AlicornAmuletItem extends ArmorItem implements AddictiveMagicalItem
         }
 
         Vec3d position = entity.getPos();
-        VecHelper.findAllEntitiesInRange(entity, world, entity.getBlockPos(), 10)
+        VecHelper.findAllEntitiesInRange(entity, world, entity.getBlockPos(), 20)
             .filter(e -> e instanceof PlayerEntity)
             .sorted((a, b) -> (int)(a.getPos().distanceTo(position) - b.getPos().distanceTo(position)))
             .findFirst()
@@ -103,12 +103,16 @@ public class AlicornAmuletItem extends ArmorItem implements AddictiveMagicalItem
         if (!player.world.isClient && !entity.removed) {
             if (player.getPos().distanceTo(entity.getPos()) < 3) {
                if (entity.world.random.nextInt(150) == 0) {
+                   entity.setPickupDelay(0);
+                   entity.onPlayerCollision(player);
 
-                   TypedActionResult<ItemStack> result = use(player.world, player, Hand.MAIN_HAND);
+                   if (player.getMainHandStack().getItem() == this) {
+                       TypedActionResult<ItemStack> result = use(player.world, player, Hand.MAIN_HAND);
 
-                   if (result.getResult() == ActionResult.SUCCESS) {
-                       entity.setPickupDelay(1000);
-                       entity.remove();
+                       if (result.getResult() == ActionResult.SUCCESS) {
+                           entity.setPickupDelay(1000);
+                           entity.remove();
+                       }
                    }
                }
             }
@@ -148,6 +152,7 @@ public class AlicornAmuletItem extends ArmorItem implements AddictiveMagicalItem
 
     @Override
     public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected) {
+
         if (!(entity instanceof PlayerEntity)) {
             return;
         }
@@ -162,6 +167,15 @@ public class AlicornAmuletItem extends ArmorItem implements AddictiveMagicalItem
 
         Pony iplayer = Pony.of(player);
 
+        if (!iplayer.getInventory().isWearing(this)) {
+
+            if (world.random.nextInt(12200) == 0 && player.getMainHandStack().getItem() == this) {
+                use(world, player, Hand.MAIN_HAND);
+            }
+
+            return;
+        }
+
         float attachedTime = iplayer.getInventory().getTicksAttached(this);
 
         MagicReserves reserves = iplayer.getMagicalReserves();