v0.2.2: corrected merging conflict (note to self: pull before you push from a different machine moron)

2014-10-30 20:55:40 -04:00 · 2014-10-30 20:55:40 -04:00 · 9170e6b11a
commit 9170e6b11a
parent bea33b33b1
1 changed files with 2 additions and 1 deletions
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java
@ -33,6 +33,7 @@ public class ConfusionGas extends Blob {
        Char ch;
        for (int i=0; i < LENGTH; i++) {
            if (cur[i] > 0 && (ch = Actor.findChar( i )) != null) {
+                if (!ch.immunities().contains(this.getClass()))
                    Buff.prolong( ch, Vertigo.class, 2 );
            }
        }