Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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:
81706e62 Make the shutdown thread try to shutdown on main
89182450 Prevent opening inventories when frozen
e6d395cc Port 04-Util.patch from Tuinity (#3136)
59453f66 Fix incorrectly loading chunks on a cancelled interact event
bdcc31ca Let invalid positioned entities clean up previous chunk by the chunkCheck
92d2907d Multiple memory and performance optimizations (removing streams)
748e6447 Improve the don't save entities patch per leafs feedback
This commit is contained in:
William Blake Galbreath
2020-04-13 19:23:38 -05:00
parent 2243be4513
commit 1231800fca
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: c096fe19fa...81706e6268

2
current-paper
View File

@@ -1 +1 @@
1.15.2--a4f180fd6c00f10e373da363dc80e7c2f67756ad
1.15.2--294ef5b86e28a9a3583ab2ce4f8ddd4b7e36e541

6
patches/server/0091-Add-option-to-disable-saving-projectiles-to-disk.patch
View File

@@ -1,4 +1,4 @@
From 843d3a1513d8d8fa010be09ff53c1dca36015d0a Mon Sep 17 00:00:00 2001
From 1e7e5241331ed8490956a00a2005baae289d08df Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 18 Feb 2020 20:07:08 -0600
Subject: [PATCH] Add option to disable saving projectiles to disk
@@ -15,7 +15,7 @@ Subject: [PATCH] Add option to disable saving projectiles to disk
8 files changed, 58 insertions(+)
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 4349d22cc8..647d303ad1 100644
index 57a6e7c133..89fa4f0a96 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -437,6 +437,7 @@ public class ChunkRegionLoader {
@@ -25,7 +25,7 @@ index 4349d22cc8..647d303ad1 100644
+ if (!entity.canSaveToDisk()) continue; // Purpur
NBTTagCompound nbttagcompound4 = new NBTTagCompound();
// Paper start
if ((int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
if (asyncsavedata == null && !entity.dead && (int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1ee3dafc45..e207a40777 100644
--- a/src/main/java/net/minecraft/server/Entity.java