Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.7.2

Browse Source
This commit is contained in:
mbax
2013-11-04 07:07:38 -06:00
committed by Wesley Wolfe
parent ff8b70fbb7
commit 2726696652
349 changed files with 14339 additions and 11287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/minecraft/server/ItemMapEmpty.java
View File

@@ -2,18 +2,17 @@ package net.minecraft.server;
public class ItemMapEmpty extends ItemWorldMapBase {
protected ItemMapEmpty(int i) {
super(i);
protected ItemMapEmpty() {
this.a(CreativeModeTab.f);
}
public ItemStack a(ItemStack itemstack, World world, EntityHuman entityhuman) {
World worldMain = world.getServer().getServer().worlds.get(0); // CraftBukkit - store reference to primary world
ItemStack itemstack1 = new ItemStack(Item.MAP, 1, worldMain.b("map")); // CraftBukkit - use primary world for maps
ItemStack itemstack1 = new ItemStack(Items.MAP, 1, worldMain.b("map")); // CraftBukkit - use primary world for maps
String s = "map_" + itemstack1.getData();
WorldMap worldmap = new WorldMap(s);
worldMain.a(s, (WorldMapBase) worldmap); // CraftBukkit - use primary world for maps
worldMain.a(s, (PersistentBase) worldmap); // CraftBukkit - use primary world for maps
worldmap.scale = 0;
int i = 128 * (1 << worldmap.scale);
@@ -29,7 +28,7 @@ public class ItemMapEmpty extends ItemWorldMapBase {
return itemstack1;
} else {
if (!entityhuman.inventory.pickup(itemstack1.cloneItemStack())) {
entityhuman.drop(itemstack1);
entityhuman.drop(itemstack1, false);
}
return itemstack;