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

Fix Entity#isTicking and update Paper entity command (#11590)

Browse source 
fixes #10299
This commit is contained in:
Jason Penilla 2024-11-09 07:41:26 -07:00 • committed by GitHub
parent 99f4bb29ba
commit 00ef8bdcb0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 30 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

6
patches/server/0017-Paper-command.patch
View file

@ -332,7 +332,7 @@ index 0000000000000000000000000000000000000000..7e9e0ff8639be135bf8575e375cbada5
+}
diff --git a/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
new file mode 100644
index 0000000000000000000000000000000000000000..67fcba634f8183bb33834ac3b2c3dcfb8d87129e
index 0000000000000000000000000000000000000000..9d9d133e0d973ecda1ef1efc872a51ee10463fd1
--- /dev/null
+++ b/src/main/java/io/papermc/paper/command/subcommands/EntityCommand.java
@@ -0,0 +1,158 @@
@ -447,7 +447,7 @@ index 0000000000000000000000000000000000000000..67fcba634f8183bb33834ac3b2c3dcfb
+ ChunkPos chunk = e.chunkPosition();
+ info.left++;
+ info.right.put(chunk, info.right.getOrDefault(chunk, 0) + 1);
+ if (!chunkProviderServer.isPositionTicking(e)) {
+ if (!world.isPositionEntityTicking(e.blockPosition())) {
+ nonEntityTicking.merge(key, 1, Integer::sum);
+ }
+ });
@ -617,7 +617,7 @@ index a61a92078a8bb4979f231c02ef5aa990b8ab57ad..cd9e4bfdb3f335213001ced27540bb7e
this.setPvpAllowed(dedicatedserverproperties.pvp);
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2affb23b83e4368a94345b36410f23139f5d36c8..1b66c5173dd37433d895c0d804257141a3a8c588 100644
index e497da2dba83779c4ad1c45cea133bddadf61446..4ec8731a48f81aff33c7d8bcfe00dea263735e48 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -991,6 +991,7 @@ public final class CraftServer implements Server {