Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +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

16
patches/server/0050-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From e958f6fd32c2078f4f4d0f98513001f56a7b7095 Mon Sep 17 00:00:00 2001
From 023247dcf9fc86239935f562c73ffe2891d9a250 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] Implement AFK API
@@ -17,7 +17,7 @@ Subject: [PATCH] Implement AFK API
10 files changed, 113 insertions(+), 24 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3d18c4eb60..95b580e80b 100644
index dee92e5a72..5e99ad8144 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1374,6 +1374,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -49,7 +49,7 @@ index 886fbb7dff..2ec3e660b3 100644
super(EntityTypes.PLAYER, world);
this.bV = ItemStack.a;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 563bf54f8b..d58c91cfb7 100644
index 08f3a390eb..6de306628c 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1581,8 +1581,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -170,7 +170,7 @@ index 8d7273a38b..71c61dc45e 100644
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
double d4 = d3 * d3;
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index cdc81ff1e2..2e74e46d5d 100644
index a4af019bc6..2db59c55ca 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -277,6 +277,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -205,10 +205,10 @@ index cdc81ff1e2..2e74e46d5d 100644
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index d5a0035124..6b28d84203 100644
index 79fa88549a..78754c254e 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -360,7 +360,7 @@ public class WorldServer extends World {
@@ -366,7 +366,7 @@ public class WorldServer extends World {
}
if (this.C && this.players.stream().noneMatch((entityplayer) -> {
@@ -217,7 +217,7 @@ index d5a0035124..6b28d84203 100644
})) {
this.C = false;
if (this.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE)) {
@@ -633,7 +633,7 @@ public class WorldServer extends World {
@@ -639,7 +639,7 @@ public class WorldServer extends World {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -287,7 +287,7 @@ index 712056cad1..c12d52e5df 100644
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index f86404f83a..5eeeb770e3 100644
index 92601c581c..185717c804 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -128,6 +128,7 @@ public class ActivationRange