mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Allow spawners to be disabled without adding a stupid high tick rate (#6837)

Browse source
This commit is contained in:
HexedHero 2021-10-31 07:51:57 +00:00 • committed by GitHub
parent a284e40c70
commit 744dd8ce79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
patches/server/0325-Mob-Spawner-API-Enhancements.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Mob Spawner API Enhancements
diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
index fe5e691ebbe930662f8a4f00811fdd8ed8ce1c52..b9e738542692aba7b78fc514ae8e3248df9998ea 100644
index f2c69ce7a33ef69c71e218cdb2f6a429c5e7b531..409467ca9a8a21d1e22e3a08f462e54d6124f6a1 100644
--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
@@ -31,7 +31,7 @@ public abstract class BaseSpawner {
@ -26,7 +26,7 @@ index fe5e691ebbe930662f8a4f00811fdd8ed8ce1c52..b9e738542692aba7b78fc514ae8e3248
return world.isAffectsSpawningPlayerNearby((double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, (double) this.requiredPlayerRange); // Paper
}
@@ -225,7 +225,7 @@ public abstract class BaseSpawner {
@@ -226,7 +226,7 @@ public abstract class BaseSpawner {
}
}
@ -35,7 +35,7 @@ index fe5e691ebbe930662f8a4f00811fdd8ed8ce1c52..b9e738542692aba7b78fc514ae8e3248
if (this.maxSpawnDelay <= this.minSpawnDelay) {
this.spawnDelay = this.minSpawnDelay;
} else {
@@ -239,7 +239,13 @@ public abstract class BaseSpawner {
@@ -240,7 +240,13 @@ public abstract class BaseSpawner {
}
public void load(@Nullable Level world, BlockPos pos, CompoundTag nbt) {
@ -49,7 +49,7 @@ index fe5e691ebbe930662f8a4f00811fdd8ed8ce1c52..b9e738542692aba7b78fc514ae8e3248
List<SpawnData> list = Lists.newArrayList();
if (nbt.contains("SpawnPotentials", 9)) {
@@ -258,10 +264,15 @@ public abstract class BaseSpawner {
@@ -259,10 +265,15 @@ public abstract class BaseSpawner {
this.setSpawnData(world, pos, mobspawnerdata);
});
}
@ -68,7 +68,7 @@ index fe5e691ebbe930662f8a4f00811fdd8ed8ce1c52..b9e738542692aba7b78fc514ae8e3248
this.spawnCount = nbt.getShort("SpawnCount");
}
@@ -283,9 +294,20 @@ public abstract class BaseSpawner {
@@ -284,9 +295,20 @@ public abstract class BaseSpawner {
if (minecraftkey == null) {
return nbt;
} else {