Merge pull request #93 from demonlexe/91-kitty-medallion-bugfix

Kitty Medallion Bugfix (READY)
Elite-Modding-Team · Dec 31, 2023 · 6144a21 · 6144a21
2 parents 23aa388 + 467ad73
commit 6144a21
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/drzhark/mocreatures/entity/tameable/MoCEntityTameableAnimal.java b/src/main/java/drzhark/mocreatures/entity/tameable/MoCEntityTameableAnimal.java
@@ -231,7 +231,10 @@ public Boolean processTameInteract(EntityPlayer player, EnumHand hand) {
                 if (petData != null) {
                     petData.setInAmulet(this.getOwnerPetId(), true);
                 }
-                this.dropMyStuff();
+                if (!(this instanceof MoCEntityKitty)) {
+                    // bugfix for Kitty, #91 - was dropping medallion when captured in amulet
+                    this.dropMyStuff();
+                }
                 MoCTools.dropAmulet(this, 2, player);
                 this.isDead = true;
             }