Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +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:
3cd952e2 Yank 0417-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
c47cf32c Restore 0129-Optimize-World.isLoaded-BlockPosition-Z.patch
16071c7e Remove applied oversized chunks patch
cd499c92 Restore Use-getChunkIfLoadedImmediately-in-places.patch
7986f57e Bring back Reduce-sync-loads.patch (#2761)
9e58f226 Address gen concurrency issue causing crashes (Fixes #2746)
This commit is contained in:
William Blake Galbreath
2019-12-16 19:24:35 -06:00
parent 02eba92e93
commit 3984c3706f
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 350893286175492ce9dd02d807bb093b15bbd310 Mon Sep 17 00:00:00 2001
From 95ff0e54f1d111aecc87857dddd5ae493e811d01 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
@@ -57,7 +57,7 @@ index 3ed74ae0ec..8139108470 100644
// Paper end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 985f303726..46b0c68207 100644
index 2c92d3390a..97c4a6773a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -96,6 +96,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -69,7 +69,7 @@ index 985f303726..46b0c68207 100644
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPosition lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
@@ -137,6 +139,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -145,6 +147,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
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