From 54b068ea78c4b7a943e939842336993094df7184 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Sun, 7 Jun 2015 02:44:57 -0400
Subject: [PATCH] v0.3.0c: changes the order of removal vs activation on plants
 and traps

---
 .../shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java | 2 +-
 src/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java
index 13bcc35ea..f169dae38 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java
@@ -47,8 +47,8 @@ public abstract class Trap implements Bundlable {
 		if (Dungeon.visible[pos]){
 			Sample.INSTANCE.play(Assets.SND_TRAP);
 		}
-		activate();
 		disarm();
+		activate();
 	}
 
 	public abstract void activate();
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java
index c657fea35..23bf3560b 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java
@@ -59,8 +59,8 @@ public abstract class Plant implements Bundlable {
 			Buff.affect( ch, Barkskin.class ).level( ch.HT / 3 );
 		}
 
-		activate();
 		wither();
+		activate();
 	}
 	
 	public abstract void activate();