core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0117-Fix-Bugs-with-Spigot-M...

61 lines
2.9 KiB
Diff
Raw Normal View History

Update upstream B/CB Closes GH-569
2017-01-06 21:45:59 +00:00
From 82a710b86ac776efc85ae57246a489a52f439582 Mon Sep 17 00:00:00 2001
Fix Bugs with Spigot Mob Spawn Logic - Fixes #138 Spigot drastically altered vanilla mob spawn logic and caused a few issues. 1) Used only spawnable chunks vs entire world for entity counting, resulting in ignoring other entities in the world, and causing the world to go over its intended limit. Specially with servers using smaller mob spawn ranges than view distance, as well as affects spawning API 2) Spigot was using 16x16 division instead of vanilla 17x17 division. Issues got worse in 1.9 due to more chunks being loaded due to 1.9 changes, that fall out of the monster spawn radius. This patch returns mob counting to use all loaded chunks, and 17x17 division.
2016-04-15 01:03:57 +00:00
From: Aikar <aikar@aikar.co>
Date: Thu, 14 Apr 2016 21:01:39 -0400
Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic
Spigot drastically altered vanilla mob spawn logic and caused a few issues.
1) Used only spawnable chunks vs entire world for entity counting, resulting in ignoring
other entities in the world, and causing the world to go over its intended limit.
Specially with servers using smaller mob spawn ranges than view distance, as well as affects spawning API
2) Spigot was using 16x16 division instead of vanilla 17x17 division.
This patch returns mob counting to use all loaded chunks, and 17x17 division.
Ensure we actually removed entity from chunk before decrementing counts If a plugin hacks into NMS and triggers entity removal, it could result in an entity being attempted to remove from the chunk twice. The 2nd pass will return false, as it did not find the entity in the list. We should not touch entity counts if the entity was not removed, to avoid going negative.
2016-04-16 01:31:12 +00:00
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
Update Paper to MC 1.11
2016-11-17 02:23:38 +00:00
index 61d34fc..a6cf1d8 100644
Ensure we actually removed entity from chunk before decrementing counts If a plugin hacks into NMS and triggers entity removal, it could result in an entity being attempted to remove from the chunk twice. The 2nd pass will return false, as it did not find the entity in the list. We should not touch entity counts if the entity was not removed, to avoid going negative.
2016-04-16 01:31:12 +00:00
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
Optimize isInvalidYLocation, getType and getBlockData Some pretty micro optimizations, but this is the hottest method in the server.... This will drastically reduce number of operations to perform getType the 2 previous patches was squashed into 1
2016-06-23 02:43:02 +00:00
@@ -680,7 +680,7 @@ public class Chunk {
Ensure we actually removed entity from chunk before decrementing counts If a plugin hacks into NMS and triggers entity removal, it could result in an entity being attempted to remove from the chunk twice. The 2nd pass will return false, as it did not find the entity in the list. We should not touch entity counts if the entity was not removed, to avoid going negative.
2016-04-16 01:31:12 +00:00
i = this.entitySlices.length - 1;
}
- this.entitySlices[i].remove(entity);
+ if (!this.entitySlices[i].remove(entity)) { return; } // Paper
// Paper start - update counts
if (entity instanceof EntityItem) {
itemCounts[i]--;
Fix Bugs with Spigot Mob Spawn Logic - Fixes #138 Spigot drastically altered vanilla mob spawn logic and caused a few issues. 1) Used only spawnable chunks vs entire world for entity counting, resulting in ignoring other entities in the world, and causing the world to go over its intended limit. Specially with servers using smaller mob spawn ranges than view distance, as well as affects spawning API 2) Spigot was using 16x16 division instead of vanilla 17x17 division. Issues got worse in 1.9 due to more chunks being loaded due to 1.9 changes, that fall out of the monster spawn radius. This patch returns mob counting to use all loaded chunks, and 17x17 division.
2016-04-15 01:03:57 +00:00
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
Update Paper to MC 1.11.1
2016-12-20 22:34:27 +00:00
index c95fb7f..0a7a310 100644
Fix Bugs with Spigot Mob Spawn Logic - Fixes #138 Spigot drastically altered vanilla mob spawn logic and caused a few issues. 1) Used only spawnable chunks vs entire world for entity counting, resulting in ignoring other entities in the world, and causing the world to go over its intended limit. Specially with servers using smaller mob spawn ranges than view distance, as well as affects spawning API 2) Spigot was using 16x16 division instead of vanilla 17x17 division. Issues got worse in 1.9 due to more chunks being loaded due to 1.9 changes, that fall out of the monster spawn radius. This patch returns mob counting to use all loaded chunks, and 17x17 division.
2016-04-15 01:03:57 +00:00
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
Update upstream B/CB/S
2016-07-15 22:36:53 +00:00
@@ -23,6 +23,15 @@ public final class SpawnerCreature {
Fix Bugs with Spigot Mob Spawn Logic - Fixes #138 Spigot drastically altered vanilla mob spawn logic and caused a few issues. 1) Used only spawnable chunks vs entire world for entity counting, resulting in ignoring other entities in the world, and causing the world to go over its intended limit. Specially with servers using smaller mob spawn ranges than view distance, as well as affects spawning API 2) Spigot was using 16x16 division instead of vanilla 17x17 division. Issues got worse in 1.9 due to more chunks being loaded due to 1.9 changes, that fall out of the monster spawn radius. This patch returns mob counting to use all loaded chunks, and 17x17 division.
2016-04-15 01:03:57 +00:00
// Spigot start - get entity count only from chunks being processed in b
private int getEntityCount(WorldServer server, Class oClass)
{
+ // Paper start - use entire world, not just active chunks. Spigot broke vanilla expectations.
+ if (true) {
+ return server
+ .getChunkProviderServer()
+ .chunks.values()
+ .stream()
+ .collect(java.util.stream.Collectors.summingInt(c -> c.entityCount.get(oClass)));
+ }
+ // Paper end
int i = 0;
Iterator<Long> it = this.b.iterator();
while ( it.hasNext() )
Update Paper to MC 1.11
2016-11-17 02:23:38 +00:00
@@ -126,7 +135,7 @@ public final class SpawnerCreature {
Fix Bugs with Spigot Mob Spawn Logic - Fixes #138 Spigot drastically altered vanilla mob spawn logic and caused a few issues. 1) Used only spawnable chunks vs entire world for entity counting, resulting in ignoring other entities in the world, and causing the world to go over its intended limit. Specially with servers using smaller mob spawn ranges than view distance, as well as affects spawning API 2) Spigot was using 16x16 division instead of vanilla 17x17 division. Issues got worse in 1.9 due to more chunks being loaded due to 1.9 changes, that fall out of the monster spawn radius. This patch returns mob counting to use all loaded chunks, and 17x17 division.
2016-04-15 01:03:57 +00:00
int l1 = limit * i / a; // CraftBukkit - use per-world limits
*/ // Paper end
- if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
+ if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 289) { // Paper - use 17x17 like vanilla (a at top of file)
BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
Iterator iterator1 = this.b.iterator();
--
Update upstream CB
2016-12-10 23:50:31 +00:00
2.9.3
Fix Bugs with Spigot Mob Spawn Logic - Fixes #138 Spigot drastically altered vanilla mob spawn logic and caused a few issues. 1) Used only spawnable chunks vs entire world for entity counting, resulting in ignoring other entities in the world, and causing the world to go over its intended limit. Specially with servers using smaller mob spawn ranges than view distance, as well as affects spawning API 2) Spigot was using 16x16 division instead of vanilla 17x17 division. Issues got worse in 1.9 due to more chunks being loaded due to 1.9 changes, that fall out of the monster spawn radius. This patch returns mob counting to use all loaded chunks, and 17x17 division.
2016-04-15 01:03:57 +00:00