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 appears to apply and compile correctly

Paper Changes:
8812fed9 Merge pull request #2240 from Spottedleaf/anti-xray
bd46b639 Merge branch 'ver/1.14' of github.com:PaperMC/Paper into anti-xray
e679a7c1 Config migrations
0a667728 Resolve crash issue by shoving chunk loads onto the next tick
3a2d7f2d Merge branch 'ver/1.14' of github.com:PaperMC/Paper into anti-xray
5ffa0dae Do not force load chunks for plugin constructed packets
e993aa6f Merge branch 'ver/1.14' of github.com:PaperMC/Paper into anti-xray
9a4a185f Keep neighbour chunks loaded while obfuscating
f1f8060a Fix build?
76eb2a5e Use getChunkIfLoadedImmediately not getChunkIfCachedImmediately
ad757f96 Delete 0335-Anti-Xray.patch
46a6f1b2 Re-Add Anti-Xray
This commit is contained in:
William Blake Galbreath
2019-07-09 21:26:17 -05:00
parent f7cc910566
commit 378bbf478c
15 changed files with 20 additions and 1770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0002-Purpur-config-files.patch
View File

@@ -1,4 +1,4 @@
From 2e9eb1dadfd676fce0e6e5a18cb5e80722cdf531 Mon Sep 17 00:00:00 2001
From b1ad4714c121f84b34a056cb3954ed0960487200 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:09:43 -0500
Subject: [PATCH] Purpur config files
@@ -37,22 +37,22 @@ index c1473330f..f438323be 100644
// Paper end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index a7a35d6a6..c8f198fdf 100644
index ee6474b18..c86c9d1ec 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -94,6 +94,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -97,6 +97,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
+ public final net.pl3x.purpur.PurpurWorldConfig purpurConfig; // Purpur
+
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPosition lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
@@ -134,6 +136,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction<World, WorldProvider, IChunkProvider> bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) {
@@ -138,6 +140,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper
this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
+ this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig(worlddata.getName(), this.paperConfig, this.spigotConfig); // Purpur
this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env);