konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3.0.0: fixed dupes involving trinity and thrown weapons

Browse Source
This commit is contained in:
Evan Debenham
2025-02-07 16:18:40 -05:00
parent 6162338282
commit 707dfba4f6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java
View File

@@ -303,7 +303,7 @@ abstract public class MissileWeapon extends Weapon {
decrementDurability(); decrementDurability();
if (durability > 0){ if (durability > 0){
//attempt to stick the missile weapon to the enemy, just drop it if we can't. //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); PinCushion p = Buff.affect(enemy, PinCushion.class);
if (p.target == enemy){ if (p.target == enemy){
p.stick(this); p.stick(this);

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java
View File

@@ -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. //attempt to stick the dart to the enemy, just drop it if we can't.
Dart d = new Dart(); Dart d = new Dart();
Catalog.countUse(getClass()); 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); PinCushion p = Buff.affect(enemy, PinCushion.class);
if (p.target == enemy){ if (p.target == enemy){
p.stick(d); p.stick(d);