9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-27 02:49:10 +00:00

Update Paper

This commit is contained in:
violetc
2023-12-28 13:11:10 +08:00
parent 434ea125d2
commit cb31cda2f4
38 changed files with 96 additions and 101 deletions

View File

@@ -81,7 +81,7 @@ index f655e0ae4a287886d0291cd0089bad2000249d0f..2694f899241ad8ce06d3bcba78550af5
AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
boolean flag1 = advancementprogress.isDone();
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index d9a33968fa0f1aa5def297f34ba1dbf229ee7c32..a54e9a6a35760eae2c70eb6b9d4881ec6bbb42de 100644
index 931d77112ad02e712225efe7e0218fadde24400d..3e7bdcfd3d0ba845fef79c02d110d4a5df182216 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1422,6 +1422,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -99,7 +99,7 @@ index d9a33968fa0f1aa5def297f34ba1dbf229ee7c32..a54e9a6a35760eae2c70eb6b9d4881ec
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index d1f20a8a3ccea1f074624163eb96da023142a459..5922236bc6c69a8266144435e665861a657778ac 100644
index 0eb3384df396508c3d26d1e155cd0e6d64251346..6f062dc3e48d1c7a1e766f699428b44ef91bace4 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -186,6 +186,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -190,7 +190,7 @@ index 0046043408e5ec5737857d833f0a43f91d418df0..68cc14ef2176dd20ede46af3d62ef079
player.connection = this;
player.getTextFilter().join();
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 937c4aefc5f24cbfe3f9c9fce3cfb2f40db5675b..81c09a9686731953787b56c3c8a20543418941a4 100644
index 00f4ee320f8a8d019cb311cee78bb38445835952..52f6ef8702a1902df079b1ec34282b46aae5d01e 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -120,6 +120,8 @@ import org.bukkit.event.player.PlayerRespawnEvent.RespawnReason;
@@ -238,7 +238,7 @@ index 937c4aefc5f24cbfe3f9c9fce3cfb2f40db5675b..81c09a9686731953787b56c3c8a20543
// CraftBukkit end
return entityplayer1;
}
@@ -1110,11 +1134,16 @@ public abstract class PlayerList {
@@ -1116,11 +1140,16 @@ public abstract class PlayerList {
}
public String[] getPlayerNamesArray() {
@@ -256,7 +256,7 @@ index 937c4aefc5f24cbfe3f9c9fce3cfb2f40db5675b..81c09a9686731953787b56c3c8a20543
return astring;
}
@@ -1593,4 +1622,16 @@ public abstract class PlayerList {
@@ -1599,4 +1628,16 @@ public abstract class PlayerList {
public boolean isAllowCheatsForAllPlayers() {
return this.allowCheatsForAllPlayers;
}
@@ -353,7 +353,7 @@ index dfeb3e336e06ef01f5401a362755030db942bb07..c51413bf02b3572a05f09d2f0d02493d
if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper
BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21));
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 72e8f8cc4db8b75e3c93470911a0509eef2d9a1f..9782a52dbbad0f1c4baaf3651790b19619def28f 100644
index dc4ce7bbde058560c077fe2004da64e3113ccace..602d913b144c6d565e09c5623859c40775a4fcca 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -259,6 +259,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
@@ -372,7 +372,7 @@ index 72e8f8cc4db8b75e3c93470911a0509eef2d9a1f..9782a52dbbad0f1c4baaf3651790b196
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -3242,4 +3244,11 @@ public final class CraftServer implements Server {
@@ -3246,4 +3248,11 @@ public final class CraftServer implements Server {
}
// Paper end
@@ -385,7 +385,7 @@ index 72e8f8cc4db8b75e3c93470911a0509eef2d9a1f..9782a52dbbad0f1c4baaf3651790b196
+ // Leaves end - Bot API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 1727e932ac6b9ca09b5df96f9547ff125114e15a..418f16debd40e7588c8cfea2876a9688ceb11730 100644
index 1c3e1153d08b59d29b3613fc3b50a4780aa7a3ac..fa92ba466c958eea0330cd24bf45b96958a13204 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -54,6 +54,8 @@ import org.bukkit.plugin.Plugin;