Updated to Minecraft 1.1

3 files changed, 17 insertions, 1 deletions

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 467f3603..7184022d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -55,6 +55,7 @@ import net.minecraft.server.WorldMap;
 import net.minecraft.server.WorldMapCollection;
 import net.minecraft.server.WorldNBTStorage;
 import net.minecraft.server.WorldSettings;
+import net.minecraft.server.WorldType;
 import org.bukkit.*;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -512,6 +513,7 @@ public final class CraftServer implements Server {
         ChunkGenerator generator = creator.generator();
         File folder = new File(name);
         World world = getWorld(name);
+        WorldType type = WorldType.a(creator.type().getName());
 
         if (world != null) {
             return world;
@@ -533,7 +535,7 @@ public final class CraftServer implements Server {
 
         int dimension = 10 + console.worlds.size();
         boolean hardcore = false;
-        WorldServer internal = new WorldServer(console, new ServerNBTManager(getWorldContainer(), name, true), name, dimension, new WorldSettings(creator.seed(), getDefaultGameMode().getValue(), true, hardcore), creator.environment(), generator);
+        WorldServer internal = new WorldServer(console, new ServerNBTManager(getWorldContainer(), name, true), name, dimension, new WorldSettings(creator.seed(), getDefaultGameMode().getValue(), true, hardcore, type), creator.environment(), generator);
 
         if (!(worlds.containsKey(name.toLowerCase()))) {
             return null;
diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
index aab74435..3bca3607 100644
--- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
+++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
@@ -43,6 +43,8 @@ public class CraftEnchantment extends Enchantment {
                 return EnchantmentTarget.TOOL;
             case WEAPON:
                 return EnchantmentTarget.WEAPON;
+            case BOW:
+                return EnchantmentTarget.BOW;
             default:
                 return null;
         }
@@ -90,6 +92,14 @@ public class CraftEnchantment extends Enchantment {
                 return "DURABILITY";
             case 35:
                 return "LOOT_BONUS_BLOCKS";
+            case 48:
+                return "ARROW_DAMAGE";
+            case 49:
+                return "ARROW_KNOCKBACK";
+            case 50:
+                return "ARROW_FIRE";
+            case 51:
+                return "ARROW_INFINITE";
             default:
                 return "UNKNOWN_ENCHANT_" + target.id;
         }
diff --git a/src/main/java/org/bukkit/craftbukkit/util/LongHashset.java b/src/main/java/org/bukkit/craftbukkit/util/LongHashset.java
index 0368aa6b..8c17e4f3 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/LongHashset.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/LongHashset.java
@@ -21,6 +21,10 @@ public class LongHashset extends LongHash {
         }
     }
 
+    public int size() {
+        return count;
+    }
+
     public void add(int msw, int lsw) {
         add(toLong(msw, lsw));
     }