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:
parent
a8ef7aa56f
commit
284a7fed94
4 changed files with 5 additions and 5 deletions
|
@ -687,7 +687,7 @@ index 1bee6fc5b9fa70adf2f7cac792778f5ed203d291..e688949fc2f3031dc9c9817bc59554e9
|
|||
+ // Paper end
|
||||
}
|
||||
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
|
||||
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
||||
@@ -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 static BlockPos lastPhysicsProblem; // Spigot
|
||||
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) {
|
||||
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue