Maps shouldn t load chunks
This commit is contained in:
367
sources/src/main/java/net/minecraft/server/ItemWorldMap.java
Normal file
367
sources/src/main/java/net/minecraft/server/ItemWorldMap.java
Normal file
@@ -0,0 +1,367 @@
|
||||
package net.minecraft.server;
|
||||
|
||||
import com.google.common.collect.HashMultiset;
|
||||
import com.google.common.collect.Iterables;
|
||||
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 {
|
||||
|
||||
protected ItemWorldMap() {
|
||||
this.a(true);
|
||||
}
|
||||
|
||||
public static ItemStack a(World world, double d0, double d1, byte b0, boolean flag, boolean flag1) {
|
||||
World worldMain = world.getServer().getServer().worlds.get(0); // CraftBukkit - store reference to primary world
|
||||
ItemStack itemstack = new ItemStack(Items.FILLED_MAP, 1, worldMain.b("map")); // CraftBukkit - use primary world for maps
|
||||
String s = "map_" + itemstack.getData();
|
||||
WorldMap worldmap = new WorldMap(s);
|
||||
|
||||
worldMain.a(s, (PersistentBase) worldmap); // CraftBukkit
|
||||
worldmap.scale = b0;
|
||||
worldmap.a(d0, d1, worldmap.scale);
|
||||
worldmap.map = (byte) ((WorldServer) world).dimension; // CraftBukkit - use bukkit dimension
|
||||
worldmap.track = flag;
|
||||
worldmap.unlimitedTracking = flag1;
|
||||
worldmap.c();
|
||||
org.bukkit.craftbukkit.event.CraftEventFactory.callEvent(new org.bukkit.event.server.MapInitializeEvent(worldmap.mapView)); // CraftBukkit
|
||||
return itemstack;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public WorldMap getSavedMap(ItemStack itemstack, World world) {
|
||||
World worldMain = world.getServer().getServer().worlds.get(0); // CraftBukkit - store reference to primary world
|
||||
String s = "map_" + itemstack.getData();
|
||||
WorldMap worldmap = (WorldMap) worldMain.a(WorldMap.class, s); // CraftBukkit - use primary world for maps
|
||||
|
||||
if (worldmap == null && !world.isClientSide) {
|
||||
itemstack.setData(worldMain.b("map")); // CraftBukkit - use primary world for maps
|
||||
s = "map_" + itemstack.getData();
|
||||
worldmap = new WorldMap(s);
|
||||
worldmap.scale = 3;
|
||||
worldmap.a((double) world.getWorldData().b(), (double) world.getWorldData().d(), worldmap.scale);
|
||||
worldmap.map = (byte) ((WorldServer) world).dimension; // CraftBukkit - fixes Bukkit multiworld maps
|
||||
worldmap.c();
|
||||
worldMain.a(s, (PersistentBase) worldmap); // CraftBukkit - use primary world for maps
|
||||
|
||||
// CraftBukkit start
|
||||
MapInitializeEvent event = new MapInitializeEvent(worldmap.mapView);
|
||||
Bukkit.getServer().getPluginManager().callEvent(event);
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
return worldmap;
|
||||
}
|
||||
|
||||
public void a(World world, Entity entity, WorldMap worldmap) {
|
||||
// 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;
|
||||
int l = MathHelper.floor(entity.locX - (double) j) / i + 64;
|
||||
int i1 = MathHelper.floor(entity.locZ - (double) k) / i + 64;
|
||||
int j1 = 128 / i;
|
||||
|
||||
if (world.worldProvider.n()) {
|
||||
j1 /= 2;
|
||||
}
|
||||
|
||||
WorldMap.WorldMapHumanTracker worldmap_worldmaphumantracker = worldmap.a((EntityHuman) entity);
|
||||
|
||||
++worldmap_worldmaphumantracker.b;
|
||||
boolean flag = false;
|
||||
|
||||
for (int k1 = l - j1 + 1; k1 < l + j1; ++k1) {
|
||||
if ((k1 & 15) == (worldmap_worldmaphumantracker.b & 15) || flag) {
|
||||
flag = false;
|
||||
double d0 = 0.0D;
|
||||
|
||||
for (int l1 = i1 - j1 - 1; l1 < i1 + j1; ++l1) {
|
||||
if (k1 >= 0 && l1 >= -1 && k1 < 128 && l1 < 128) {
|
||||
int i2 = k1 - l;
|
||||
int j2 = l1 - i1;
|
||||
boolean flag1 = i2 * i2 + j2 * j2 > (j1 - 2) * (j1 - 2);
|
||||
int k2 = (j / i + k1 - 64) * i;
|
||||
int l2 = (k / i + l1 - 64) * i;
|
||||
HashMultiset hashmultiset = HashMultiset.create();
|
||||
Chunk chunk = world.getChunkIfLoaded(new BlockPosition(k2, 0, l2)); // NeonPaper - Maps shouldn't load chunks
|
||||
|
||||
if (chunk != null && !chunk.isEmpty()) { // NeonPaper - Maps shouldn't load chunks
|
||||
int i3 = k2 & 15;
|
||||
int j3 = l2 & 15;
|
||||
int k3 = 0;
|
||||
double d1 = 0.0D;
|
||||
|
||||
if (world.worldProvider.n()) {
|
||||
int l3 = k2 + l2 * 231871;
|
||||
|
||||
l3 = l3 * l3 * 31287121 + l3 * 11;
|
||||
if ((l3 >> 20 & 1) == 0) {
|
||||
hashmultiset.add(Blocks.DIRT.getBlockData().set(BlockDirt.VARIANT, BlockDirt.EnumDirtVariant.DIRT).a((IBlockAccess) world, BlockPosition.ZERO), 10);
|
||||
} else {
|
||||
hashmultiset.add(Blocks.STONE.getBlockData().set(BlockStone.VARIANT, BlockStone.EnumStoneVariant.STONE).a((IBlockAccess) world, BlockPosition.ZERO), 100);
|
||||
}
|
||||
|
||||
d1 = 100.0D;
|
||||
} else {
|
||||
BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
|
||||
|
||||
for (int i4 = 0; i4 < i; ++i4) {
|
||||
for (int j4 = 0; j4 < i; ++j4) {
|
||||
int k4 = chunk.b(i4 + i3, j4 + j3) + 1;
|
||||
IBlockData iblockdata = Blocks.AIR.getBlockData();
|
||||
|
||||
if (k4 > 1) {
|
||||
do {
|
||||
--k4;
|
||||
iblockdata = chunk.a(i4 + i3, k4, j4 + j3);
|
||||
blockposition_mutableblockposition.c((chunk.locX << 4) + i4 + i3, k4, (chunk.locZ << 4) + j4 + j3);
|
||||
} while (iblockdata.a((IBlockAccess) world, blockposition_mutableblockposition) == MaterialMapColor.c && k4 > 0);
|
||||
|
||||
if (k4 > 0 && iblockdata.getMaterial().isLiquid()) {
|
||||
int l4 = k4 - 1;
|
||||
|
||||
IBlockData iblockdata1;
|
||||
|
||||
do {
|
||||
iblockdata1 = chunk.a(i4 + i3, l4--, j4 + j3);
|
||||
++k3;
|
||||
} while (l4 > 0 && iblockdata1.getMaterial().isLiquid());
|
||||
}
|
||||
} else {
|
||||
iblockdata = Blocks.BEDROCK.getBlockData();
|
||||
}
|
||||
|
||||
d1 += (double) k4 / (double) (i * i);
|
||||
hashmultiset.add(iblockdata.a((IBlockAccess) world, blockposition_mutableblockposition));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
k3 /= i * i;
|
||||
double d2 = (d1 - d0) * 4.0D / (double) (i + 4) + ((double) (k1 + l1 & 1) - 0.5D) * 0.4D;
|
||||
byte b0 = 1;
|
||||
|
||||
if (d2 > 0.6D) {
|
||||
b0 = 2;
|
||||
}
|
||||
|
||||
if (d2 < -0.6D) {
|
||||
b0 = 0;
|
||||
}
|
||||
|
||||
MaterialMapColor materialmapcolor = (MaterialMapColor) Iterables.getFirst(Multisets.copyHighestCountFirst(hashmultiset), MaterialMapColor.c);
|
||||
|
||||
if (materialmapcolor == MaterialMapColor.o) {
|
||||
d2 = (double) k3 * 0.1D + (double) (k1 + l1 & 1) * 0.2D;
|
||||
b0 = 1;
|
||||
if (d2 < 0.5D) {
|
||||
b0 = 2;
|
||||
}
|
||||
|
||||
if (d2 > 0.9D) {
|
||||
b0 = 0;
|
||||
}
|
||||
}
|
||||
|
||||
d0 = d1;
|
||||
if (l1 >= 0 && i2 * i2 + j2 * j2 < j1 * j1 && (!flag1 || (k1 + l1 & 1) != 0)) {
|
||||
byte b1 = worldmap.colors[k1 + l1 * 128];
|
||||
byte b2 = (byte) (materialmapcolor.ad * 4 + b0);
|
||||
|
||||
if (b1 != b2) {
|
||||
worldmap.colors[k1 + l1 * 128] = b2;
|
||||
worldmap.flagDirty(k1, l1);
|
||||
flag = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public static void a(World world, ItemStack itemstack) {
|
||||
if (itemstack.getItem() == Items.FILLED_MAP) {
|
||||
WorldMap worldmap = Items.FILLED_MAP.getSavedMap(itemstack, world);
|
||||
|
||||
if (worldmap != null) {
|
||||
if (world.worldProvider.getDimensionManager().getDimensionID() == worldmap.map) {
|
||||
int i = 1 << worldmap.scale;
|
||||
int j = worldmap.centerX;
|
||||
int k = worldmap.centerZ;
|
||||
BiomeBase[] abiomebase = world.getWorldChunkManager().a((BiomeBase[]) null, (j / i - 64) * i, (k / i - 64) * i, 128 * i, 128 * i, false);
|
||||
|
||||
for (int l = 0; l < 128; ++l) {
|
||||
for (int i1 = 0; i1 < 128; ++i1) {
|
||||
int j1 = l * i;
|
||||
int k1 = i1 * i;
|
||||
BiomeBase biomebase = abiomebase[j1 + k1 * 128 * i];
|
||||
MaterialMapColor materialmapcolor = MaterialMapColor.c;
|
||||
int l1 = 3;
|
||||
int i2 = 8;
|
||||
|
||||
if (l > 0 && i1 > 0 && l < 127 && i1 < 127) {
|
||||
if (abiomebase[(l - 1) * i + (i1 - 1) * i * 128 * i].j() >= 0.0F) {
|
||||
--i2;
|
||||
}
|
||||
|
||||
if (abiomebase[(l - 1) * i + (i1 + 1) * i * 128 * i].j() >= 0.0F) {
|
||||
--i2;
|
||||
}
|
||||
|
||||
if (abiomebase[(l - 1) * i + i1 * i * 128 * i].j() >= 0.0F) {
|
||||
--i2;
|
||||
}
|
||||
|
||||
if (abiomebase[(l + 1) * i + (i1 - 1) * i * 128 * i].j() >= 0.0F) {
|
||||
--i2;
|
||||
}
|
||||
|
||||
if (abiomebase[(l + 1) * i + (i1 + 1) * i * 128 * i].j() >= 0.0F) {
|
||||
--i2;
|
||||
}
|
||||
|
||||
if (abiomebase[(l + 1) * i + i1 * i * 128 * i].j() >= 0.0F) {
|
||||
--i2;
|
||||
}
|
||||
|
||||
if (abiomebase[l * i + (i1 - 1) * i * 128 * i].j() >= 0.0F) {
|
||||
--i2;
|
||||
}
|
||||
|
||||
if (abiomebase[l * i + (i1 + 1) * i * 128 * i].j() >= 0.0F) {
|
||||
--i2;
|
||||
}
|
||||
|
||||
if (biomebase.j() < 0.0F) {
|
||||
materialmapcolor = MaterialMapColor.r;
|
||||
if (i2 > 7 && i1 % 2 == 0) {
|
||||
l1 = (l + (int) (MathHelper.sin((float) i1 + 0.0F) * 7.0F)) / 8 % 5;
|
||||
if (l1 == 3) {
|
||||
l1 = 1;
|
||||
} else if (l1 == 4) {
|
||||
l1 = 0;
|
||||
}
|
||||
} else if (i2 > 7) {
|
||||
materialmapcolor = MaterialMapColor.c;
|
||||
} else if (i2 > 5) {
|
||||
l1 = 1;
|
||||
} else if (i2 > 3) {
|
||||
l1 = 0;
|
||||
} else if (i2 > 1) {
|
||||
l1 = 0;
|
||||
}
|
||||
} else if (i2 > 0) {
|
||||
materialmapcolor = MaterialMapColor.C;
|
||||
if (i2 > 3) {
|
||||
l1 = 1;
|
||||
} else {
|
||||
l1 = 3;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (materialmapcolor != MaterialMapColor.c) {
|
||||
worldmap.colors[l + i1 * 128] = (byte) (materialmapcolor.ad * 4 + l1);
|
||||
worldmap.flagDirty(l, i1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void a(ItemStack itemstack, World world, Entity entity, int i, boolean flag) {
|
||||
if (!world.isClientSide) {
|
||||
WorldMap worldmap = this.getSavedMap(itemstack, world);
|
||||
|
||||
if (entity instanceof EntityHuman) {
|
||||
EntityHuman entityhuman = (EntityHuman) entity;
|
||||
|
||||
worldmap.a(entityhuman, itemstack);
|
||||
}
|
||||
|
||||
if (flag || entity instanceof EntityHuman && ((EntityHuman) entity).getItemInOffHand() == itemstack) {
|
||||
this.a(world, entity, worldmap);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public Packet<?> a(ItemStack itemstack, World world, EntityHuman entityhuman) {
|
||||
return this.getSavedMap(itemstack, world).a(itemstack, world, entityhuman);
|
||||
}
|
||||
|
||||
public void b(ItemStack itemstack, World world, EntityHuman entityhuman) {
|
||||
NBTTagCompound nbttagcompound = itemstack.getTag();
|
||||
|
||||
if (nbttagcompound != null) {
|
||||
if (nbttagcompound.hasKeyOfType("map_scale_direction", 99)) {
|
||||
a(itemstack, world, nbttagcompound.getInt("map_scale_direction"));
|
||||
nbttagcompound.remove("map_scale_direction");
|
||||
} else if (nbttagcompound.getBoolean("map_tracking_position")) {
|
||||
b(itemstack, world);
|
||||
nbttagcompound.remove("map_tracking_position");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
protected static void a(ItemStack itemstack, World world, int i) {
|
||||
WorldMap worldmap = Items.FILLED_MAP.getSavedMap(itemstack, world);
|
||||
|
||||
world = world.getServer().getServer().worlds.get(0); // CraftBukkit - use primary world for maps
|
||||
itemstack.setData(world.b("map"));
|
||||
WorldMap worldmap1 = new WorldMap("map_" + itemstack.getData());
|
||||
|
||||
if (worldmap != null) {
|
||||
worldmap1.scale = (byte) MathHelper.clamp(worldmap.scale + i, 0, 4);
|
||||
worldmap1.track = worldmap.track;
|
||||
worldmap1.a((double) worldmap.centerX, (double) worldmap.centerZ, worldmap1.scale);
|
||||
worldmap1.map = worldmap.map;
|
||||
worldmap1.c();
|
||||
world.a("map_" + itemstack.getData(), (PersistentBase) worldmap1);
|
||||
// CraftBukkit start
|
||||
MapInitializeEvent event = new MapInitializeEvent(worldmap1.mapView);
|
||||
Bukkit.getServer().getPluginManager().callEvent(event);
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
protected static void b(ItemStack itemstack, World world) {
|
||||
WorldMap worldmap = Items.FILLED_MAP.getSavedMap(itemstack, world);
|
||||
|
||||
world = world.getServer().getServer().worlds.get(0); // CraftBukkit - use primary world for maps
|
||||
itemstack.setData(world.b("map"));
|
||||
WorldMap worldmap1 = new WorldMap("map_" + itemstack.getData());
|
||||
|
||||
worldmap1.track = true;
|
||||
if (worldmap != null) {
|
||||
worldmap1.centerX = worldmap.centerX;
|
||||
worldmap1.centerZ = worldmap.centerZ;
|
||||
worldmap1.scale = worldmap.scale;
|
||||
worldmap1.map = worldmap.map;
|
||||
worldmap1.c();
|
||||
world.a("map_" + itemstack.getData(), (PersistentBase) worldmap1);
|
||||
// CraftBukkit start
|
||||
MapInitializeEvent event = new MapInitializeEvent(worldmap1.mapView);
|
||||
Bukkit.getServer().getPluginManager().callEvent(event);
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user