Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-22 06:20:06 +01:00
74 Zeilen
3.2 KiB
Diff
74 Zeilen
3.2 KiB
Diff
--- a/net/minecraft/server/ItemWorldMap.java
|
|
+++ b/net/minecraft/server/ItemWorldMap.java
|
|
@@ -6,6 +6,11 @@
|
|
import com.google.common.collect.Multisets;
|
|
import javax.annotation.Nullable;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.Bukkit;
|
|
+import org.bukkit.event.server.MapInitializeEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class ItemWorldMap extends ItemWorldMapBase {
|
|
|
|
public ItemWorldMap(Item.Info item_info) {
|
|
@@ -15,7 +20,7 @@
|
|
public static ItemStack createFilledMapView(World world, int i, int j, byte b0, boolean flag, boolean flag1) {
|
|
ItemStack itemstack = new ItemStack(Items.FILLED_MAP);
|
|
|
|
- a(itemstack, world, i, j, b0, flag, flag1, world.worldProvider.getDimensionManager());
|
|
+ a(itemstack, world, i, j, b0, flag, flag1, ((WorldServer) world).dimension); // CraftBukkit - fixes Bukkit multiworld maps
|
|
return itemstack;
|
|
}
|
|
|
|
@@ -29,7 +34,7 @@
|
|
WorldMap worldmap = a(itemstack, world);
|
|
|
|
if (worldmap == null && !world.isClientSide) {
|
|
- worldmap = a(itemstack, world, world.getWorldData().b(), world.getWorldData().d(), 3, false, false, world.worldProvider.getDimensionManager());
|
|
+ worldmap = a(itemstack, world, world.getWorldData().b(), world.getWorldData().d(), 3, false, false, ((WorldServer) world).dimension); // CraftBukkit - fixes Bukkit multiworld maps
|
|
}
|
|
|
|
return worldmap;
|
|
@@ -38,7 +43,7 @@
|
|
public static int e(ItemStack itemstack) {
|
|
NBTTagCompound nbttagcompound = itemstack.getTag();
|
|
|
|
- return nbttagcompound != null && nbttagcompound.hasKeyOfType("map", 99) ? nbttagcompound.getInt("map") : 0;
|
|
+ return nbttagcompound != null && nbttagcompound.hasKeyOfType("map", 99) ? nbttagcompound.getInt("map") : -1; // CraftBukkit - make new maps for no tag
|
|
}
|
|
|
|
private static WorldMap a(ItemStack itemstack, World world, int i, int j, int k, boolean flag, boolean flag1, DimensionManager dimensionmanager) {
|
|
@@ -48,6 +53,11 @@
|
|
worldmap.a(i, j, k, flag, flag1, dimensionmanager);
|
|
world.a(worldmap);
|
|
itemstack.getOrCreateTag().setInt("map", l);
|
|
+
|
|
+ // CraftBukkit start
|
|
+ MapInitializeEvent event = new MapInitializeEvent(worldmap.mapView);
|
|
+ Bukkit.getServer().getPluginManager().callEvent(event);
|
|
+ // CraftBukkit end
|
|
return worldmap;
|
|
}
|
|
|
|
@@ -56,7 +66,8 @@
|
|
}
|
|
|
|
public void a(World world, Entity entity, WorldMap worldmap) {
|
|
- if (world.worldProvider.getDimensionManager() == worldmap.map && entity instanceof EntityHuman) {
|
|
+ // CraftBukkit - world.worldProvider -> ((WorldServer) world)
|
|
+ if (((WorldServer) world).dimension == worldmap.map && entity instanceof EntityHuman) {
|
|
int i = 1 << worldmap.scale;
|
|
int j = worldmap.centerX;
|
|
int k = worldmap.centerZ;
|
|
@@ -208,7 +219,8 @@
|
|
WorldMap worldmap = getSavedMap(itemstack, world);
|
|
|
|
if (worldmap != null) {
|
|
- if (world.worldProvider.getDimensionManager() == worldmap.map) {
|
|
+ // CraftBukkit - world.worldProvider -> ((WorldServer) world)
|
|
+ if (((WorldServer) world).dimension == worldmap.map) {
|
|
int i = 1 << worldmap.scale;
|
|
int j = worldmap.centerX;
|
|
int k = worldmap.centerZ;
|