2022-05-06 17:33:07 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Noah van der Aa <ndvdaa@gmail.com>
|
|
|
|
Date: Fri, 7 Jan 2022 11:58:26 +0100
|
|
|
|
Subject: [PATCH] Don't tick markers
|
|
|
|
|
2023-04-02 20:21:13 +02:00
|
|
|
Fixes https://github.com/PaperMC/Paper/issues/7276 and https://github.com/PaperMC/Paper/issues/8118
|
|
|
|
by using a config option that, when set to false, does not add markers to the entity
|
|
|
|
tick list at all and ignores them in Spigot's activation range checks. The entity tick
|
2022-05-06 17:33:07 +02:00
|
|
|
list is only used in the tick and tickPassenger methods, so we can safely not add the
|
2023-04-02 20:21:13 +02:00
|
|
|
markers to it. When the config option is set to true, markers are ticked as normal.
|
2022-05-06 17:33:07 +02:00
|
|
|
|
2022-07-09 01:01:42 +02:00
|
|
|
diff --git a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
|
2024-01-18 18:52:00 +01:00
|
|
|
index ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8..5e5a018433414af76eaa1e781f61612ddc305b07 100644
|
2022-07-09 01:01:42 +02:00
|
|
|
--- a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
|
|
|
|
+++ b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
|
2023-03-04 22:35:07 +01:00
|
|
|
@@ -109,7 +109,7 @@ public final class EntityCommand implements PaperSubcommand {
|
2022-07-09 01:01:42 +02:00
|
|
|
ChunkPos chunk = e.chunkPosition();
|
|
|
|
info.left++;
|
|
|
|
info.right.put(chunk, info.right.getOrDefault(chunk, 0) + 1);
|
|
|
|
- if (!chunkProviderServer.isPositionTicking(e)) {
|
2024-01-18 18:52:00 +01:00
|
|
|
+ if (!chunkProviderServer.isPositionTicking(e) || (e instanceof net.minecraft.world.entity.Marker && !world.paperConfig().entities.markers.tick)) { // Paper - Configurable marker ticking
|
2022-07-09 01:01:42 +02:00
|
|
|
nonEntityTicking.merge(key, 1, Integer::sum);
|
|
|
|
}
|
|
|
|
});
|
2022-05-06 17:33:07 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
2024-01-23 14:34:17 +01:00
|
|
|
index 36ffc24778b307d239a8af43486ed54f78c7ea68..6cd9f531b3c92641d8452a6d7a807ea8f9a61e8f 100644
|
2022-05-06 17:33:07 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
2024-01-22 21:04:08 +01:00
|
|
|
@@ -2538,6 +2538,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
2022-05-06 17:33:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public void onTickingStart(Entity entity) {
|
2023-04-02 20:21:13 +02:00
|
|
|
+ if (entity instanceof net.minecraft.world.entity.Marker && !paperConfig().entities.markers.tick) return; // Paper - Configurable marker ticking
|
2022-05-06 17:33:07 +02:00
|
|
|
ServerLevel.this.entityTickList.add(entity);
|
|
|
|
}
|
2022-09-26 10:02:51 +02:00
|
|
|
|
2022-05-06 17:33:07 +02:00
|
|
|
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
2024-01-18 18:52:00 +01:00
|
|
|
index 3495981419a75efe42bce45a89a32378dd6b8372..fafc8b84d6b6368c70b8eedfdb4c3a9deace9c26 100644
|
2022-05-06 17:33:07 +02:00
|
|
|
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
|
|
|
+++ b/src/main/java/org/spigotmc/ActivationRange.java
|
2023-09-22 22:13:57 +02:00
|
|
|
@@ -213,8 +213,14 @@ public class ActivationRange
|
2022-05-06 17:33:07 +02:00
|
|
|
|
2023-09-22 22:13:57 +02:00
|
|
|
// Paper start
|
2023-10-27 01:34:58 +02:00
|
|
|
java.util.List<Entity> entities = world.getEntities((Entity)null, ActivationRange.maxBB, null);
|
2024-01-18 18:52:00 +01:00
|
|
|
+ boolean tickMarkers = world.paperConfig().entities.markers.tick; // Paper - Configurable marker ticking
|
2023-09-22 22:13:57 +02:00
|
|
|
for (int i = 0; i < entities.size(); i++) {
|
|
|
|
Entity entity = entities.get(i);
|
2024-01-18 18:52:00 +01:00
|
|
|
+ // Paper start - Configurable marker ticking
|
2023-09-22 22:13:57 +02:00
|
|
|
+ if (!tickMarkers && entity instanceof net.minecraft.world.entity.Marker) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
2024-01-18 18:52:00 +01:00
|
|
|
+ // Paper end - Configurable marker ticking
|
2023-09-22 22:13:57 +02:00
|
|
|
ActivationRange.activateEntity(entity);
|
|
|
|
}
|
|
|
|
// Paper end
|