From 958bc5ecd00dd80a651a437e887092615deb4744 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Wed, 24 Sep 2025 18:00:14 -0400
Subject: [PATCH] v3.2.5: fixed pincushion merging keeping existing enchants,
 not incoming

---
 .../shatteredpixeldungeon/actors/buffs/PinCushion.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/PinCushion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/PinCushion.java
index dfed86573..6c5078aed 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/PinCushion.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/PinCushion.java
@@ -38,10 +38,11 @@ public class PinCushion extends Buff {
 	private ArrayList<MissileWeapon> items = new ArrayList<>();
 
 	public void stick(MissileWeapon projectile){
-		for (Item item : items){
-			if (item.isSimilar(projectile)){
-				item.merge(projectile);
-				if (TippedDart.lostDarts > 0){
+		for (int i = 0; i < items.size(); i++) {
+			if (projectile.isSimilar(items.get(i))) {
+				projectile.merge(items.get(i));
+				items.set(i, projectile);
+				if (TippedDart.lostDarts > 0) {
 					Dart d = new Dart();
 					d.quantity(TippedDart.lostDarts);
 					TippedDart.lostDarts = 0;