Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07: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:
29453f1d Fix bug on y bitset extraction from 1.16 update
97cedaa5 Optimize the advancement data player iteration to be O(N) rather than O(N^2)
c2c4cf44 [Auto] Updated Upstream (CraftBukkit/Spigot)
e588fd94 Fix Concurrency issue in WeightedList
409b4774 Fix Explosion location - Fixes #3574 (#3826)
This commit is contained in:
William Blake Galbreath
2020-07-07 09:37:58 -05:00
parent 3f4b3de50b
commit 8adc57fb34
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: edfa517d5d...29453f1dbe

2
current-paper
View File

@@ -1 +1 @@
1.16.1--80870c6d6570a0eb47ecd86fac2db5ed8cc1c5e6 1.16.1--7b7e5e36d11d6efb4beb8d1d5c04e44b8a3d6796

6
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -5734,7 +5734,7 @@ index 1fa7061f7a..f6f3bdc61d 100644
throw (IllegalArgumentException) SystemUtils.c(new IllegalArgumentException()); throw (IllegalArgumentException) SystemUtils.c(new IllegalArgumentException());
} else if (voxelshape == voxelshape1) { } else if (voxelshape == voxelshape1) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b598c48692..8df4ef4881 100644 index 5f81997db7..4a956f3681 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/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 GeneratorAccess, AutoCloseable { @@ -94,6 +94,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -5806,7 +5806,7 @@ index b598c48692..8df4ef4881 100644
@@ -504,6 +532,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -504,6 +532,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
// CraftBukkit start - Split off from above in order to directly send client and physic updates // CraftBukkit start - Split off from above in order to directly send client and physic updates
public void notifyAndUpdatePhysics(BlockPosition blockposition, Chunk chunk, IBlockData oldBlock, IBlockData newBlock, IBlockData actualBlock, int i) { public void notifyAndUpdatePhysics(BlockPosition blockposition, Chunk chunk, IBlockData oldBlock, IBlockData newBlock, IBlockData actualBlock, int i, int j) {
+ com.tuinity.tuinity.util.TickThread.softEnsureTickThread("Async notify and update"); // Tuinity + com.tuinity.tuinity.util.TickThread.softEnsureTickThread("Async notify and update"); // Tuinity
IBlockData iblockdata = newBlock; IBlockData iblockdata = newBlock;
IBlockData iblockdata1 = oldBlock; IBlockData iblockdata1 = oldBlock;
@@ -6704,7 +6704,7 @@ index d8103ab0d5..ba42171096 100644
public void restart() { public void restart() {
org.spigotmc.RestartCommand.restart(); org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 724c0816d8..21bd9f14e1 100644 index 65b36a1741..b12da9e3b3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -336,6 +336,13 @@ public class CraftWorld implements World { @@ -336,6 +336,13 @@ public class CraftWorld implements World {