mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-13 07:05:39 +02:00
49 lines
2.9 KiB
Diff
49 lines
2.9 KiB
Diff
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
|
|
|
|
Fixes https://github.com/PaperMC/Paper/issues/7276 by not adding markers to the entity
|
|
tick list at all and ignoring them in Spigot's activation range checks. The entity tick
|
|
list is only used in the tick and tickPassenger methods, so we can safely not add the
|
|
markers to it.
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
|
|
index ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8..4ec1e8ded06c60d81446c67bba2aa8a04111fa9b 100644
|
|
--- a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
|
|
+++ b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
|
|
@@ -109,7 +109,7 @@ public final class EntityCommand implements PaperSubcommand {
|
|
ChunkPos chunk = e.chunkPosition();
|
|
info.left++;
|
|
info.right.put(chunk, info.right.getOrDefault(chunk, 0) + 1);
|
|
- if (!chunkProviderServer.isPositionTicking(e)) {
|
|
+ if (!chunkProviderServer.isPositionTicking(e) || e instanceof net.minecraft.world.entity.Marker) { // Markers aren't ticked.
|
|
nonEntityTicking.merge(key, 1, Integer::sum);
|
|
}
|
|
});
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
index 66b1ef69fe48340b5ccebd845b39f898515ff117..7ae780c4a38eb088f876e5bd03a0dba5836787fb 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
@@ -2497,6 +2497,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
|
}
|
|
|
|
public void onTickingStart(Entity entity) {
|
|
+ if (entity instanceof net.minecraft.world.entity.Marker) return; // Paper - Don't tick markers
|
|
ServerLevel.this.entityTickList.add(entity);
|
|
}
|
|
|
|
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
|
index f158fc8a151272428a33dc5f6e1742876edc80d5..e881584d38dc354204479863f004e974a0ac6c07 100644
|
|
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
|
+++ b/src/main/java/org/spigotmc/ActivationRange.java
|
|
@@ -212,7 +212,7 @@ public class ActivationRange
|
|
// Paper end
|
|
|
|
// Paper start
|
|
- java.util.List<Entity> entities = world.getEntities((Entity)null, maxBB, null);
|
|
+ java.util.List<Entity> entities = world.getEntities((Entity)null, maxBB, (e) -> !(e instanceof net.minecraft.world.entity.Marker)); // Don't tick markers
|
|
for (int i = 0; i < entities.size(); i++) {
|
|
Entity entity = entities.get(i);
|
|
ActivationRange.activateEntity(entity);
|