core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Upstream (Bukkit/CraftBukkit/Spigot) 

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

Bukkit Changes:
07a05531 SPIGOT-6781: Add Block#canPlace

CraftBukkit Changes:
dd02403b Fix upgrading worlds with custom generators
1c82731d SPIGOT-6781: Add Block#canPlace
2f6662d4 Improve multi-dimension code
6ac2e032 SPIGOT-6802: Fix major issues with --forceUpgrade

Spigot Changes:
d5de7346 Rebuild patches
This commit is contained in:
Jason Penilla 2021-11-23 01:02:15 -08:00 committed by MiniDigger | Martin
parent a8ef7aa56f
commit 284a7fed94
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0004-Paper-config-files.patch
View File

@ -687,7 +687,7 @@ index 1bee6fc5b9fa70adf2f7cac792778f5ed203d291..e688949fc2f3031dc9c9817bc59554e9
+ // Paper end + // Paper end
} }
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index f705a40fad19e218669857ffccc3589e074c94b7..90d1567aa49ca6005f956f7e3c1cb14ac4cf9c22 100644 index f189c90f855900a8b8f98a468b7ca4993488ba4c..e2b9c20a82630f1991228c6194acef5ef6a7b8b0 100644
--- a/src/main/java/net/minecraft/world/level/Level.java --- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -149,6 +149,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -149,6 +149,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@ -699,7 +699,7 @@ index f705a40fad19e218669857ffccc3589e074c94b7..90d1567aa49ca6005f956f7e3c1cb14a
public final SpigotTimings.WorldTimingsHandler timings; // Spigot public final SpigotTimings.WorldTimingsHandler timings; // Spigot
public static BlockPos lastPhysicsProblem; // Spigot public static BlockPos lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter; private org.spigotmc.TickLimiter entityLimiter;
@@ -169,6 +171,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -167,6 +169,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, final DimensionType dimensionmanager, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env) { protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, final DimensionType dimensionmanager, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env) {
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot

2
work/Bukkit

@ -1 +1 @@
Subproject commit 64c8bd39e019135647e27f919b19ea03de2e6d92 Subproject commit 07a055315ce10d9e6134b9367443ddeeda501236

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 37e63e63e89052671198b6cdb775d5250a5d18e1 Subproject commit dd02403be2ea957207939f1eec83cd2753d95bbc

2
work/Spigot

@ -1 +1 @@
Subproject commit 16c0cb416707182fd13db47ff090ea48bd54e494 Subproject commit d5de734690f9745e2c8968cf5369664ff0f53af9