Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47: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

10
patches/server/0004-Purpur-config-files.patch
View File

@@ -64,7 +64,7 @@ index 0148cadbeb41a882a05d982f0b34770b2829a04a..5213f132f826b47e2825644242aaece2
if (this.source.acceptsSuccess() && !this.silent) {
this.source.sendSystemMessage(message);
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 85daf1de8ca0d48b348d1195c4243368999efee0..23454b660c123f4309d1b6eaab8f626f2663f2ef 100644
index 1b1e97f8158df3cb060ea4e16f78249329bc765c..13361a344130e32b8145762028caa289cab96f00 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -223,6 +223,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -84,19 +84,19 @@ index 85daf1de8ca0d48b348d1195c4243368999efee0..23454b660c123f4309d1b6eaab8f626f
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
// 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 8bae26d296eb73642fa1a2f83ec1a28fadcade0c..2f98c6a031a4e08c8395c326d35b129c3426b75a 100644
index 817c501bdf31d8247d0d8d0743c67578184dd0fd..a1d9994c39e19a942b0bc605bed1413498e6df16 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -175,6 +175,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -174,6 +174,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
// Paper end
public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
+ public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur
+
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPos lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
@@ -286,6 +288,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -285,6 +287,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
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