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:
b7dc6fb0 fix double world add bug (#2486)
439131c7 Updated Upstream (Bukkit/CraftBukkit)
14e07afd [CI-SKIP] Fix patch number
fc570959 Improve POI data saving logic (#2475)
5ef93ded Fix #2499 (#2500)
b3aeba41 Update Paperclip, remove gson dependency in paperclip
26f644c5 Fix sign line capping check (#2522)
b2758246 Target more sync loads (#2476)
This commit is contained in:
William Blake Galbreath
2019-09-02 11:53:48 -05:00
parent baaba9c765
commit e56dd358e9
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 1ca64cf36b3a95c2863c7ed5e6113f50335d6a79 Mon Sep 17 00:00:00 2001
From 5fbe7cc1236187e4d0fcc4c584f35c8c00450091 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 770d21468..2ff5a12d8 100644
index 468d6cc3e..5377dc158 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1396,6 +1396,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -29,7 +29,7 @@ index 770d21468..2ff5a12d8 100644
double d3 = this.locX - d0;
double d4 = this.locY - d1;
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 82da5bc1b..f45501410 100644
index 8b5ceec8d..361061129 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -170,7 +170,7 @@ index 0bac6e424..df79e4af9 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 8aa8a672d..1ecadcebe 100644
index 30595523e..6f584d515 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -274,6 +274,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -205,10 +205,10 @@ index 8aa8a672d..1ecadcebe 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 7ffcc1f1a..8214be52f 100644
index a63e102d6..b7babc897 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -318,7 +318,7 @@ public class WorldServer extends World {
@@ -324,7 +324,7 @@ public class WorldServer extends World {
}
if (this.C && this.players.stream().noneMatch((entityplayer) -> {
@@ -217,7 +217,7 @@ index 7ffcc1f1a..8214be52f 100644
})) {
this.C = false;
if (this.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE)) {
@@ -585,7 +585,7 @@ public class WorldServer extends World {
@@ -591,7 +591,7 @@ public class WorldServer extends World {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -227,7 +227,7 @@ index 7ffcc1f1a..8214be52f 100644
} else if (entityplayer.isSleeping()) {
++j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b1dcb5f8d..f4fc0b014 100644
index 059cf85f4..0764be9d1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,6 +1,7 @@