aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0030-Player-affects-spawning-API.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2024-01-24 13:07:40 +0100
committerNassim Jahnke <[email protected]>2024-01-24 13:42:24 +0100
commitad2cf68a7fb98f1ecdb766cc5a69ab86953a21f3 (patch)
treed3dd57ebed22efd67c5917db75258a201265a64a /patches/server/0030-Player-affects-spawning-API.patch
parent51bef80755a18eb3fa58ba42b1926174d5e7a76d (diff)
downloadPaper-ad2cf68a7fb98f1ecdb766cc5a69ab86953a21f3.tar.gz
Paper-ad2cf68a7fb98f1ecdb766cc5a69ab86953a21f3.zip
[ci skip] Move chunk system patch back a bit
Diffstat (limited to 'patches/server/0030-Player-affects-spawning-API.patch')
-rw-r--r--patches/server/0030-Player-affects-spawning-API.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/server/0030-Player-affects-spawning-API.patch b/patches/server/0030-Player-affects-spawning-API.patch
index cadd2053d6..d20d31285c 100644
--- a/patches/server/0030-Player-affects-spawning-API.patch
+++ b/patches/server/0030-Player-affects-spawning-API.patch
@@ -98,10 +98,10 @@ index d156f7e3430685947d2b4c30aa867e8002ca70ad..e888cf862662ae6baa6d0de8188aa74a
public void clientTick(Level world, BlockPos pos) {
diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index 2ec2b1d9d987c7f31c685aec3d3c87f42758c94b..1872de0804862be1986b4eb2e6cfe28f952fdde6 100644
+index b6a3c75b84d9f768afee33aa0f226207b307c1c0..07e7851ca27ea0f8166be52b086a6504c0deea09 100644
--- a/src/main/java/net/minecraft/world/level/EntityGetter.java
+++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
-@@ -82,6 +82,11 @@ public interface EntityGetter {
+@@ -70,6 +70,11 @@ public interface EntityGetter {
}
}
@@ -113,7 +113,7 @@ index 2ec2b1d9d987c7f31c685aec3d3c87f42758c94b..1872de0804862be1986b4eb2e6cfe28f
@Nullable
default Player getNearestPlayer(double x, double y, double z, double maxDistance, @Nullable Predicate<Entity> targetPredicate) {
double d = -1.0D;
-@@ -111,6 +116,20 @@ public interface EntityGetter {
+@@ -99,6 +104,20 @@ public interface EntityGetter {
return this.getNearestPlayer(x, y, z, maxDistance, predicate);
}
@@ -135,10 +135,10 @@ index 2ec2b1d9d987c7f31c685aec3d3c87f42758c94b..1872de0804862be1986b4eb2e6cfe28f
for(Player player : this.players()) {
if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 29cefb53474080d5e524ae54e9295dd11aa6546d..e1647bc92cc3a7e887cacb8d204ffb120114ff05 100644
+index cf8a5b3ba642d4829725bc488c074b1b3b142867..aefd38e71c7c664e3eaa366b5546bb1999c2f2c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2312,6 +2312,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2270,6 +2270,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().language;
}