Minecraft 1.9.4

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-05-10 21:47:39 +10:00
parent c9a6e9175c
commit d506c12c07
236 changed files with 1471 additions and 1822 deletions

View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/server/ItemWorldMap.java
+++ b/net/minecraft/server/ItemWorldMap.java
@@ -4,6 +4,11 @@
import com.google.common.collect.Iterables;
@@ -5,6 +5,11 @@
import com.google.common.collect.Multisets;
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.Bukkit;
@@ -12,7 +12,7 @@
public class ItemWorldMap extends ItemWorldMapBase {
protected ItemWorldMap() {
@@ -11,25 +16,32 @@
@@ -12,25 +17,32 @@
}
public WorldMap getSavedMap(ItemStack itemstack, World world) {
@@ -50,7 +50,7 @@
int i = 1 << worldmap.scale;
int j = worldmap.centerX;
int k = worldmap.centerZ;
@@ -195,6 +207,7 @@
@@ -197,6 +209,7 @@
protected static void a(ItemStack itemstack, World world, int i) {
WorldMap worldmap = Items.FILLED_MAP.getSavedMap(itemstack, world);
@@ -58,7 +58,7 @@
itemstack.setData(world.b("map"));
WorldMap worldmap1 = new WorldMap("map_" + itemstack.getData());
@@ -204,11 +217,16 @@
@@ -206,11 +219,16 @@
worldmap1.map = worldmap.map;
worldmap1.c();
world.a("map_" + itemstack.getData(), (PersistentBase) worldmap1);
@@ -75,7 +75,7 @@
itemstack.setData(world.b("map"));
WorldMap worldmap1 = new WorldMap("map_" + itemstack.getData());
@@ -219,5 +237,9 @@
@@ -221,5 +239,9 @@
worldmap1.map = worldmap.map;
worldmap1.c();
world.a("map_" + itemstack.getData(), (PersistentBase) worldmap1);