Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@fdd910e Log IOException in plugin update (#7960)
PaperMC/Paper@90836d0 1.19 Anti-Xray cleanup (#8104)
PaperMC/Paper@384d639 Fix missing redstone event call with Eigencraft redstone (#8148)
This commit is contained in:
BillyGalbreath
2022-07-18 06:49:45 -05:00
parent b5fd0447a9
commit 4951792417
7 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -2248,7 +2248,7 @@ index b42327dcf0cc9feaf4fdb67de949dd36cf71bbaa..ad166788225841927bedc5243dbe9486
}
}
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index d98c489a58c8c2e657a8879b991aa57ef78f5015..e134963fa97ea886c7cf4af8ab0ba53b6010fe41 100644
index 638d438824918bf410d66286f3b738c1c1e3311b..95d5c27a2324ef56df08238352172b62fc978ead 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -474,7 +474,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -3450,10 +3450,10 @@ index 468c635d31cfa8051666bbefce8df4b448e9ed93..17e869074b8cf29a8c3280499a27e951
final String id;
private final GameRules.Category category;
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..a26799f92db1699d2d5173e2e93be29273e1a317 100644
index 9467ccaa1d73e1913495a46919aee530e749977d..a2a0bc4874a031c964a5cdb5bc26494cd01351eb 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -272,6 +272,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -271,6 +271,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public abstract ResourceKey<LevelStem> getTypeKey();
@@ -3471,7 +3471,7 @@ index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..a26799f92db1699d2d5173e2e93be292
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, 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 - Async-Anti-Xray - Pass executor
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
@@ -294,6 +305,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -293,6 +304,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
});
final DimensionType dimensionmanager = (DimensionType) holder.value();
@@ -3485,7 +3485,7 @@ index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..a26799f92db1699d2d5173e2e93be292
this.dimension = resourcekey;
this.isClientSide = flag;
if (dimensionmanager.coordinateScale() != 1.0D) {
@@ -410,6 +428,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -409,6 +427,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
return null;
}
@@ -3577,7 +3577,7 @@ index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..a26799f92db1699d2d5173e2e93be292
public boolean isInWorldBounds(BlockPos pos) {
return pos.isInsideBuildHeightAndWorldBoundsHorizontal(this); // Paper - use better/optimized check
}
@@ -897,13 +1000,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -896,13 +999,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
try {
tickConsumer.accept(entity);
MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick
@@ -3593,7 +3593,7 @@ index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..a26799f92db1699d2d5173e2e93be292
// Paper end
}
}
@@ -1389,6 +1492,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1388,6 +1491,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public ProfilerFiller getProfiler() {
@@ -3884,7 +3884,7 @@ index d559f93a9a09bac414dd5d58afccad42c127f09b..13e749a3c40f0b2cc002f13675a9a56e
@Override
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index c46cbbf9ac4c5661933b03bc0b2559f7ade8c798..ec23064d5a6d70508fad7cffc6126cfd6f7a62cb 100644
index 2292cb0e0c1a3e0ed34b941f028136bfb0bff13e..0b08a91ae9dc73c011dbb5f517becac7d08fd1e9 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -94,6 +94,18 @@ public class LevelChunk extends ChunkAccess {
@@ -3915,7 +3915,7 @@ index c46cbbf9ac4c5661933b03bc0b2559f7ade8c798..ec23064d5a6d70508fad7cffc6126cfd
public org.bukkit.Chunk bukkitChunk;
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
index 5afb598d288d32877834cfb7d9796b334767286d..9465b2ab698362824f837abfd824e8f48fe3235c 100644
index b0c9fce9d4e06cac139e341d218d0b6aac1f1943..f25467ad1c5bac7eaef4b63b2845ad04d7c76e4e 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
@@ -27,6 +27,7 @@ public class LevelChunkSection {