Updated Upstream (Paper), closes #1556

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2288e13 Update last chunk position in findSupportingBlock
PaperMC/Paper@1595e4a Make watchdog thread extend TickThread again
PaperMC/Paper@34a2917 Add default canUse and permission methods to BasicCommand (#11047)
PaperMC/Paper@99ae7bb Don't require author and title to be set on signed book meta (#11068)
This commit is contained in:
granny
2024-07-14 20:33:40 -07:00
parent 14136b85d1
commit 458dc187f9
7 changed files with 21 additions and 21 deletions

View File

@@ -92,7 +92,7 @@ index 7d82cc6b847124cf4225428ba310309544928148..04fd1172b47a74b16955cf93fc20f64f
this.setPvpAllowed(dedicatedserverproperties.pvp);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index c1f392cd7928a142192c87cf46ef2a4fc2495562..cafb46e4ab35b5c9c4b22f9cc4970384c77e6dda 100644
index b16c3beda0fc7d7d06cfc82f450165096a88bade..304e6c2f50d4424a2fb03fbc91df50a7f1516e70 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -173,6 +173,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -103,7 +103,7 @@ index c1f392cd7928a142192c87cf46ef2a4fc2495562..cafb46e4ab35b5c9c4b22f9cc4970384
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPos lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
@@ -643,6 +644,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -645,6 +646,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config & Anti-Xray
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config