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

@@ -42,7 +42,7 @@ index 1808e1b01afa3041a54c9c9a7586d4d61960527a..5b523f3fa323378a8f96f58a9e252d2e
EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, this, other, breeder, this.breedItem, experience);
if (entityBreedEvent.isCancelled()) {
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 6f727c017a0f29e140320fc72700fd43cd91eb28..e88e450dfcccfc8f9447289ba23f8d6eb61b5d66 100644
index df3a8b3e0f21fe6b8ec850c5ccd6a0d5a513b57b..d61634dba1024ece540d79b64e013259502f7ca2 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -182,6 +182,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -95,7 +95,7 @@ index 6f727c017a0f29e140320fc72700fd43cd91eb28..e88e450dfcccfc8f9447289ba23f8d6e
public CraftWorld getWorld() {
return this.world;
}
@@ -645,6 +688,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -647,6 +690,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
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
this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur