From 707dfba4f68749c0d30ed3792f8eeec189e52fb9 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 7 Feb 2025 16:18:40 -0500 Subject: [PATCH] v3.0.0: fixed dupes involving trinity and thrown weapons --- .../items/weapon/missiles/MissileWeapon.java | 2 +- .../items/weapon/missiles/darts/TippedDart.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java index 3118d108e..7184f11be 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java @@ -303,7 +303,7 @@ abstract public class MissileWeapon extends Weapon { decrementDurability(); if (durability > 0){ //attempt to stick the missile weapon to the enemy, just drop it if we can't. - if (sticky && enemy != null && enemy.isActive() && enemy.alignment != Char.Alignment.ALLY){ + if (sticky && !spawnedForEffect && enemy != null && enemy.isActive() && enemy.alignment != Char.Alignment.ALLY){ PinCushion p = Buff.affect(enemy, PinCushion.class); if (p.target == enemy){ p.stick(this); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java index 60192d5e4..cbd38b5fd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java @@ -134,7 +134,7 @@ public abstract class TippedDart extends Dart { //attempt to stick the dart to the enemy, just drop it if we can't. Dart d = new Dart(); Catalog.countUse(getClass()); - if (sticky && enemy != null && enemy.isAlive() && enemy.alignment != Char.Alignment.ALLY){ + if (sticky && !spawnedForEffect && enemy != null && enemy.isAlive() && enemy.alignment != Char.Alignment.ALLY){ PinCushion p = Buff.affect(enemy, PinCushion.class); if (p.target == enemy){ p.stick(d);