From e1fac30e6263217f0c27ba8875b2947484f8f90a Mon Sep 17 00:00:00 2001
From: wizjany <wizjany@gmail.com>
Date: Fri, 15 Mar 2013 15:38:02 -0400
Subject: [PATCH] Updated changelog for 5.5.2

---
 CHANGELOG.txt                                             | 6 ++++++
 src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 65b47fe0f..e4d31b2c5 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,9 @@
+5.5.2
+- Update to MineCraft 1.5.
+- Fixed //flip going the wrong direction in certain cases.
+- Fixed 4096 block id support in schematics and snapshots.
+- Fixed max-blocks-changed not being used.
+
 5.5.1
 - Added support for multiple versions of Minecraft. A folder will be created in
     plugins/WorldEdit/nmsblocks which contains different class files which will be
diff --git a/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java b/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
index f85e8e674..becbb2f8c 100644
--- a/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
+++ b/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
@@ -65,6 +65,7 @@ import org.bukkit.entity.Item;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Minecart;
+import org.bukkit.entity.MinecartTNT;
 import org.bukkit.entity.Painting;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.TNTPrimed;
@@ -1031,7 +1032,7 @@ public class BukkitWorld extends LocalWorld {
                     ++num;
                 }
             } else if (type == EntityType.TNT) {
-                if (ent instanceof TNTPrimed) {
+                if (ent instanceof TNTPrimed || ent instanceof MinecartTNT) {
                     ent.remove();
                     ++num;
                 }