From c8885128401b1a0095fd7c56f0ae2ab5581137c2 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Sun, 24 Apr 2016 19:33:16 -0400
Subject: [PATCH] v0.3.5: fixed infinite shield stacking with slam

---
 .../shatteredpixeldungeon/actors/buffs/Combo.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
index 08e131738..f3e6a5afa 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
@@ -253,7 +253,7 @@ public class Combo extends Buff implements ActionIndicator.Action {
 					}
 					break;
 				case SLAM:
-					target.SHLD += dmg/2;
+					target.SHLD = Math.max( target.SHLD, dmg/2);
 					break;
 				default:
 					//nothing