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

62 lines
2.9 KiB
Diff
Raw Normal View History

Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 03:57:31 +00:00
From a95213605057d27a9ab8ec79291e1354cee01106 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
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 03:57:31 +00:00
index e9a44098d9..6c86d3b6bc 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
Fix placement of chunk tracking - Fixes #1199 Spigot had code that returned early in chunk add/remove methods. This was causing our code added to set current chunks and counts to be skipped over if the entity was default not persistent but made persistent. This was the source of many issues Fixes #1208
2018-07-15 06:44:37 +00:00
@@ -714,8 +714,8 @@ 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);
Fix placement of chunk tracking - Fixes #1199 Spigot had code that returned early in chunk add/remove methods. This was causing our code added to set current chunks and counts to be skipped over if the entity was default not persistent but made persistent. This was the source of many issues Fixes #1208
2018-07-15 06:44:37 +00:00
// Paper start
+ if (!this.entitySlices[i].remove(entity)) { return; }
entity.setCurrentChunk(null);
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 03:57:31 +00:00
entityCounts.decrement(entity.getMinecraftKeyString());
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
if (entity instanceof EntityItem) {
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
Relookup Entity Save ID if was null during precache Should fix #1280 Citizens hijacks entity map, and im guessing under the right conditions the result might actually be null during entity creation Pre the cache patch, the id is looked up on save, so it was fine. Now, if its null and the save ID is requested, we will try to look it up again and cache it if found.
2018-07-27 03:57:31 +00:00
index 45a83ae995..ed22607d91 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) {
don't use a stream for entity counts (performance)
2018-07-10 05:06:09 +00:00
+ int sum = 0;
+ for (Chunk c : server.getChunkProviderServer().chunks.values()) {
+ sum += c.entityCount.get(oClass);
+ }
+ return sum;
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
+ }
+ // 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();
--
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 07:55:24 +00:00
2.18.0
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