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

Updated Upstream (CraftBukkit/Spigot) (#8815)

Browse source 
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
ab8ace685 SPIGOT-7236: Bone meal doesn't increase use statistic
7dcb59b8e Avoid switch on material in previous commit

Spigot Changes:
19641c75 SPIGOT-7235: World.Spigot#strikeLightningEffect doesn't do anything
This commit is contained in:
Jake Potrebic 2023-01-27 12:52:04 -08:00 • committed by GitHub
parent 18fabc08d5
commit 9147456fc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
514 changed files with 124 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
View file

@ -44,7 +44,7 @@ index a67e158bad42086aec237a822ec252fd26f80e3c..829105771a06deca2a85e2f27b68d96c
this.printSaveWarning = false;
console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index bc083d58f670f2a0c6e621da5e2258f7be5680b8..f22457cf9dd5ceb6630c1f96a2050c350c4fbbc9 100644
index b6c66b8ee015847c962eb504bf4a88a5331e0944..21051093bc65d30f32c6a5ea3ee07086e10d57c1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -281,8 +281,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@ -111,7 +111,7 @@ index bc083d58f670f2a0c6e621da5e2258f7be5680b8..f22457cf9dd5ceb6630c1f96a2050c35
world.getChunkSource().getChunk(x, z, ChunkStatus.FULL, true);
return true;
// Paper end
@@ -2147,6 +2163,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2148,6 +2164,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
io.papermc.paper.chunk.system.ChunkSystem.scheduleChunkLoad(this.getHandle(), x, z, gen, ChunkStatus.FULL, true, priority, (c) -> {
net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(() -> {
net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk)c;