mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-17 05:03:55 -07:00
74b3be57b7
After further testing it appears that while the original LongHashtable has issues with object creation churn and is severly slower than even java.util.HashMap in general case benchmarks it is in fact very efficient for our use case. With this in mind I wrote a replacement LongObjectHashMap modeled after LongHashtable. Unlike the original implementation this one does not use Entry objects for storage so does not have the same object creation churn. It also uses a 2D array instead of a 3D one and does not use a cache as benchmarking shows this is more efficient. The "bucket size" was chosen based on benchmarking performance of the HashMap with contents that would be plausible for a 200+ player server. This means it uses a little extra memory for smaller servers but almost always uses less than the normal java.util.HashMap. To make up for the original LongHashtable being a poor choice for generic datasets I added a mixer to the new implementation based on code from MurmurHash. While this has no noticable effect positive or negative with our normal use of chunk coordinates it makes the HashMap perform just as well with nearly any kind of dataset. After these changes ChunkProviderServer.isChunkLoaded() goes from using 20% CPU time while sampling to not even showing up after 45 minutes of sampling due to the CPU usage being too low to be noticed.
270 lines
13 KiB
Java
270 lines
13 KiB
Java
package net.minecraft.server;
|
|
|
|
import java.util.Collection;
|
|
import java.util.HashMap;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.Random;
|
|
|
|
// CraftBukkit start
|
|
import org.bukkit.craftbukkit.util.LongHash;
|
|
import org.bukkit.craftbukkit.util.LongObjectHashMap;
|
|
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
|
|
// CraftBukkit end
|
|
|
|
public final class SpawnerCreature {
|
|
|
|
private static LongObjectHashMap<Boolean> b = new LongObjectHashMap<Boolean>(); // CraftBukkit - HashMap -> LongObjectHashMap
|
|
protected static final Class[] a = new Class[] { EntitySpider.class, EntityZombie.class, EntitySkeleton.class};
|
|
|
|
protected static ChunkPosition getRandomPosition(World world, int i, int j) {
|
|
Chunk chunk = world.getChunkAt(i, j);
|
|
int k = i * 16 + world.random.nextInt(16);
|
|
int l = j * 16 + world.random.nextInt(16);
|
|
int i1 = world.random.nextInt(chunk == null ? world.L() : chunk.h() + 16 - 1);
|
|
|
|
return new ChunkPosition(k, i1, l);
|
|
}
|
|
|
|
public static final int spawnEntities(WorldServer worldserver, boolean flag, boolean flag1) {
|
|
if (!flag && !flag1) {
|
|
return 0;
|
|
} else {
|
|
b.clear();
|
|
|
|
int i;
|
|
int j;
|
|
|
|
for (i = 0; i < worldserver.players.size(); ++i) {
|
|
EntityHuman entityhuman = (EntityHuman) worldserver.players.get(i);
|
|
int k = MathHelper.floor(entityhuman.locX / 16.0D);
|
|
|
|
j = MathHelper.floor(entityhuman.locZ / 16.0D);
|
|
byte b0 = 8;
|
|
|
|
for (int l = -b0; l <= b0; ++l) {
|
|
for (int i1 = -b0; i1 <= b0; ++i1) {
|
|
boolean flag2 = l == -b0 || l == b0 || i1 == -b0 || i1 == b0;
|
|
|
|
// CraftBukkit start
|
|
long chunkCoords = LongHash.toLong(l + k, i1 + j);
|
|
|
|
if (!flag2) {
|
|
b.put(chunkCoords, false);
|
|
} else if (!b.containsKey(chunkCoords)) {
|
|
b.put(chunkCoords, true);
|
|
}
|
|
// CraftBukkit end
|
|
}
|
|
}
|
|
}
|
|
|
|
i = 0;
|
|
ChunkCoordinates chunkcoordinates = worldserver.getSpawn();
|
|
EnumCreatureType[] aenumcreaturetype = EnumCreatureType.values();
|
|
|
|
j = aenumcreaturetype.length;
|
|
|
|
for (int j1 = 0; j1 < j; ++j1) {
|
|
EnumCreatureType enumcreaturetype = aenumcreaturetype[j1];
|
|
|
|
// CraftBukkit start - use per-world spawn limits
|
|
int limit = 0;
|
|
switch (enumcreaturetype) {
|
|
case MONSTER:
|
|
limit = worldserver.getWorld().getMonsterSpawnLimit();
|
|
break;
|
|
case CREATURE:
|
|
limit = worldserver.getWorld().getAnimalSpawnLimit();
|
|
break;
|
|
case WATER_CREATURE:
|
|
limit = worldserver.getWorld().getWaterAnimalSpawnLimit();
|
|
break;
|
|
}
|
|
|
|
if (limit == 0) {
|
|
return 0;
|
|
}
|
|
// CraftBukkit end
|
|
|
|
if ((!enumcreaturetype.d() || flag1) && (enumcreaturetype.d() || flag) && worldserver.a(enumcreaturetype.a()) <= limit * b.size() / 256) { // CraftBukkit - use per-world limits
|
|
Iterator iterator = b.keySet().iterator();
|
|
|
|
label108:
|
|
while (iterator.hasNext()) {
|
|
// CraftBukkit start
|
|
long key = ((Long) iterator.next()).longValue();
|
|
|
|
if (!b.get(key)) {
|
|
ChunkPosition chunkposition = getRandomPosition(worldserver, LongHash.msw(key), LongHash.lsw(key));
|
|
// CraftBukkit end
|
|
int k1 = chunkposition.x;
|
|
int l1 = chunkposition.y;
|
|
int i2 = chunkposition.z;
|
|
|
|
if (!worldserver.s(k1, l1, i2) && worldserver.getMaterial(k1, l1, i2) == enumcreaturetype.c()) {
|
|
int j2 = 0;
|
|
int k2 = 0;
|
|
|
|
while (k2 < 3) {
|
|
int l2 = k1;
|
|
int i3 = l1;
|
|
int j3 = i2;
|
|
byte b1 = 6;
|
|
BiomeMeta biomemeta = null;
|
|
int k3 = 0;
|
|
|
|
while (true) {
|
|
if (k3 < 4) {
|
|
label101: {
|
|
l2 += worldserver.random.nextInt(b1) - worldserver.random.nextInt(b1);
|
|
i3 += worldserver.random.nextInt(1) - worldserver.random.nextInt(1);
|
|
j3 += worldserver.random.nextInt(b1) - worldserver.random.nextInt(b1);
|
|
if (a(enumcreaturetype, worldserver, l2, i3, j3)) {
|
|
float f = (float) l2 + 0.5F;
|
|
float f1 = (float) i3;
|
|
float f2 = (float) j3 + 0.5F;
|
|
|
|
if (worldserver.findNearbyPlayer((double) f, (double) f1, (double) f2, 24.0D) == null) {
|
|
float f3 = f - (float) chunkcoordinates.x;
|
|
float f4 = f1 - (float) chunkcoordinates.y;
|
|
float f5 = f2 - (float) chunkcoordinates.z;
|
|
float f6 = f3 * f3 + f4 * f4 + f5 * f5;
|
|
|
|
if (f6 >= 576.0F) {
|
|
if (biomemeta == null) {
|
|
biomemeta = worldserver.a(enumcreaturetype, l2, i3, j3);
|
|
if (biomemeta == null) {
|
|
break label101;
|
|
}
|
|
}
|
|
|
|
EntityLiving entityliving;
|
|
|
|
try {
|
|
entityliving = (EntityLiving) biomemeta.b.getConstructor(new Class[] { World.class}).newInstance(new Object[] { worldserver});
|
|
} catch (Exception exception) {
|
|
exception.printStackTrace();
|
|
return i;
|
|
}
|
|
|
|
entityliving.setPositionRotation((double) f, (double) f1, (double) f2, worldserver.random.nextFloat() * 360.0F, 0.0F);
|
|
if (entityliving.canSpawn()) {
|
|
++j2;
|
|
// CraftBukkit - added a reason for spawning this creature
|
|
worldserver.addEntity(entityliving, SpawnReason.NATURAL);
|
|
a(entityliving, worldserver, f, f1, f2);
|
|
if (j2 >= entityliving.bl()) {
|
|
continue label108;
|
|
}
|
|
}
|
|
|
|
i += j2;
|
|
}
|
|
}
|
|
}
|
|
|
|
++k3;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
++k2;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return i;
|
|
}
|
|
}
|
|
|
|
public static boolean a(EnumCreatureType enumcreaturetype, World world, int i, int j, int k) {
|
|
if (enumcreaturetype.c() == Material.WATER) {
|
|
return world.getMaterial(i, j, k).isLiquid() && !world.s(i, j + 1, k);
|
|
} else if (!world.t(i, j - 1, k)) {
|
|
return false;
|
|
} else {
|
|
int l = world.getTypeId(i, j - 1, k);
|
|
|
|
return l != Block.BEDROCK.id && !world.s(i, j, k) && !world.getMaterial(i, j, k).isLiquid() && !world.s(i, j + 1, k);
|
|
}
|
|
}
|
|
|
|
private static void a(EntityLiving entityliving, World world, float f, float f1, float f2) {
|
|
if (entityliving.dead) return; // CraftBukkit
|
|
if (entityliving instanceof EntitySpider && world.random.nextInt(100) == 0) {
|
|
EntitySkeleton entityskeleton = new EntitySkeleton(world);
|
|
|
|
entityskeleton.setPositionRotation((double) f, (double) f1, (double) f2, entityliving.yaw, 0.0F);
|
|
// CraftBukkit - added a reason for spawning this creature
|
|
world.addEntity(entityskeleton, SpawnReason.JOCKEY);
|
|
entityskeleton.mount(entityliving);
|
|
} else if (entityliving instanceof EntitySheep) {
|
|
((EntitySheep) entityliving).setColor(EntitySheep.a(world.random));
|
|
} else if (entityliving instanceof EntityOcelot && world.random.nextInt(7) == 0) {
|
|
for (int i = 0; i < 2; ++i) {
|
|
EntityOcelot entityocelot = new EntityOcelot(world);
|
|
|
|
entityocelot.setPositionRotation((double) f, (double) f1, (double) f2, entityliving.yaw, 0.0F);
|
|
entityocelot.setAge(-24000);
|
|
world.addEntity(entityocelot, SpawnReason.NATURAL); // CraftBukkit - added SpawnReason
|
|
}
|
|
}
|
|
}
|
|
|
|
public static void a(World world, BiomeBase biomebase, int i, int j, int k, int l, Random random) {
|
|
List list = biomebase.getMobs(EnumCreatureType.CREATURE);
|
|
|
|
if (!list.isEmpty()) {
|
|
while (random.nextFloat() < biomebase.f()) {
|
|
BiomeMeta biomemeta = (BiomeMeta) WeightedRandom.a(world.random, (Collection) list);
|
|
int i1 = biomemeta.c + random.nextInt(1 + biomemeta.d - biomemeta.c);
|
|
int j1 = i + random.nextInt(k);
|
|
int k1 = j + random.nextInt(l);
|
|
int l1 = j1;
|
|
int i2 = k1;
|
|
|
|
for (int j2 = 0; j2 < i1; ++j2) {
|
|
boolean flag = false;
|
|
|
|
for (int k2 = 0; !flag && k2 < 4; ++k2) {
|
|
int l2 = world.h(j1, k1);
|
|
|
|
if (a(EnumCreatureType.CREATURE, world, j1, l2, k1)) {
|
|
float f = (float) j1 + 0.5F;
|
|
float f1 = (float) l2;
|
|
float f2 = (float) k1 + 0.5F;
|
|
|
|
EntityLiving entityliving;
|
|
|
|
try {
|
|
entityliving = (EntityLiving) biomemeta.b.getConstructor(new Class[] { World.class}).newInstance(new Object[] { world});
|
|
} catch (Exception exception) {
|
|
exception.printStackTrace();
|
|
continue;
|
|
}
|
|
|
|
entityliving.setPositionRotation((double) f, (double) f1, (double) f2, random.nextFloat() * 360.0F, 0.0F);
|
|
// CraftBukkit - added a reason for spawning this creature
|
|
world.addEntity(entityliving, SpawnReason.CHUNK_GEN);
|
|
a(entityliving, world, f, f1, f2);
|
|
flag = true;
|
|
}
|
|
|
|
j1 += random.nextInt(5) - random.nextInt(5);
|
|
|
|
for (k1 += random.nextInt(5) - random.nextInt(5); j1 < i || j1 >= i + k || k1 < j || k1 >= j + k; k1 = i2 + random.nextInt(5) - random.nextInt(5)) {
|
|
j1 = l1 + random.nextInt(5) - random.nextInt(5);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|