Update to Minecraft 1.8.3

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions

View File

@@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/ItemMapEmpty.java Wed Dec 17 16:16:12 2014
+++ src/main/java/net/minecraft/server/ItemMapEmpty.java Wed Dec 17 16:16:12 2014
--- /home/matt/mc-dev-private//net/minecraft/server/ItemMapEmpty.java 2015-02-26 22:40:22.835608137 +0000
+++ src/main/java/net/minecraft/server/ItemMapEmpty.java 2015-02-26 22:40:22.835608137 +0000
@@ -7,15 +7,19 @@
}
@@ -11,15 +11,15 @@
WorldMap worldmap = new WorldMap(s);
- world.a(s, (PersistentBase) worldmap);
+ worldMain.a(s, (PersistentBase) worldmap);
+ worldMain.a(s, (PersistentBase) worldmap); // CraftBukkit
worldmap.scale = 0;
worldmap.a(entityhuman.locX, entityhuman.locZ, worldmap.scale);
- worldmap.map = (byte) world.worldProvider.getDimension();
+ worldmap.map = (byte) ((WorldServer) world).dimension; // CraftBukkit - use bukkit dimension
worldmap.c();
+
+
+ org.bukkit.craftbukkit.event.CraftEventFactory.callEvent(new org.bukkit.event.server.MapInitializeEvent(worldmap.mapView)); // CraftBukkit
+
+
--itemstack.count;
if (itemstack.count <= 0) {
return itemstack1;