From 9170e6b11ada394f3cac00d1a0ff2ee60184dc29 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 30 Oct 2014 20:55:40 -0400 Subject: [PATCH] v0.2.2: corrected merging conflict (note to self: pull before you push from a different machine moron) --- .../shatteredpixeldungeon/actors/blobs/ConfusionGas.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java index b3f3a5ee3..4e6f8861c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java @@ -33,7 +33,8 @@ public class ConfusionGas extends Blob { Char ch; for (int i=0; i < LENGTH; i++) { if (cur[i] > 0 && (ch = Actor.findChar( i )) != null) { - Buff.prolong( ch, Vertigo.class, 2 ); + if (!ch.immunities().contains(this.getClass())) + Buff.prolong( ch, Vertigo.class, 2 ); } } }