1 files changed, 33 insertions, 32 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 9218f074..adb2bba3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1,52 +1,54 @@
 package org.bukkit.craftbukkit;
 
 import java.io.File;
-import java.util.Iterator;
-import java.util.Set;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+import java.util.Set;
 import java.util.UUID;
-import org.apache.commons.lang.Validate;
-
-import org.bukkit.craftbukkit.entity.*;
-import org.bukkit.craftbukkit.metadata.BlockMetadataStore;
-import org.bukkit.entity.*;
-import org.bukkit.entity.Entity;
 
 import net.minecraft.server.*;
 
-import org.bukkit.entity.Arrow;
-import org.bukkit.Effect;
-import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
-import org.bukkit.event.weather.WeatherChangeEvent;
-import org.bukkit.event.weather.ThunderChangeEvent;
-import org.bukkit.event.world.SpawnChangeEvent;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Boat;
-import org.bukkit.Chunk;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.metadata.MetadataValue;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.util.Vector;
+import org.apache.commons.lang.Validate;
 import org.bukkit.BlockChangeDelegate;
 import org.bukkit.Bukkit;
-import org.bukkit.generator.ChunkGenerator;
+import org.bukkit.Chunk;
 import org.bukkit.ChunkSnapshot;
+import org.bukkit.Difficulty;
+import org.bukkit.Effect;
 import org.bukkit.Location;
+import org.bukkit.Sound;
 import org.bukkit.TreeType;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
-import org.bukkit.generator.BlockPopulator;
-import org.bukkit.Difficulty;
-import org.bukkit.Sound;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.craftbukkit.block.CraftBlock;
+import org.bukkit.craftbukkit.entity.*;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
-import org.bukkit.plugin.messaging.StandardMessenger;
+import org.bukkit.craftbukkit.metadata.BlockMetadataStore;
 import org.bukkit.craftbukkit.util.LongHash;
+import org.bukkit.entity.*;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.minecart.ExplosiveMinecart;
+import org.bukkit.entity.minecart.HopperMinecart;
+import org.bukkit.entity.minecart.PoweredMinecart;
+import org.bukkit.entity.minecart.SpawnerMinecart;
+import org.bukkit.entity.minecart.StorageMinecart;
+import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
+import org.bukkit.event.weather.ThunderChangeEvent;
+import org.bukkit.event.weather.WeatherChangeEvent;
+import org.bukkit.event.world.SpawnChangeEvent;
+import org.bukkit.generator.BlockPopulator;
+import org.bukkit.generator.ChunkGenerator;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.metadata.MetadataValue;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.messaging.StandardMessenger;
+import org.bukkit.util.Vector;
 
 public class CraftWorld implements World {
     public static final int CUSTOM_DIMENSION_OFFSET = 10;
@@ -252,7 +254,6 @@ public class CraftWorld implements World {
         return chunk != null;
     }
 
-    @SuppressWarnings("unchecked")
     private void chunkLoadPostProcess(net.minecraft.server.Chunk chunk, int x, int z) {
         if (chunk != null) {
             world.chunkProviderServer.chunks.put(LongHash.toLong(x, z), chunk);
@@ -864,13 +865,13 @@ public class CraftWorld implements World {
                 entity = new EntityMinecartFurnace(world, x, y, z);
             } else if (StorageMinecart.class.isAssignableFrom(clazz)) {
                 entity = new EntityMinecartChest(world, x, y, z);
-            } else if (MinecartTNT.class.isAssignableFrom(clazz)) {
+            } else if (ExplosiveMinecart.class.isAssignableFrom(clazz)) {
                 entity = new EntityMinecartTNT(world, x, y, z);
-            } else if (MinecartHopper.class.isAssignableFrom(clazz)) {
+            } else if (HopperMinecart.class.isAssignableFrom(clazz)) {
                 entity = new EntityMinecartHopper(world, x, y, z);
-            } else if (MinecartMobSpawner.class.isAssignableFrom(clazz)) {
+            } else if (SpawnerMinecart.class.isAssignableFrom(clazz)) {
                 entity = new EntityMinecartMobSpawner(world, x, y, z);
-            } else {
+            } else { // Default to rideable minecart for pre-rideable compatibility
                 entity = new EntityMinecartRideable(world, x, y, z);
             }
         } else if (EnderSignal.class.isAssignableFrom(clazz)) {