Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47: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:
a96d3e89 [Auto] Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-07-01 20:56:22 -05:00
parent 3b4e44ff44
commit eed34befaa
10 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0009-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From 9cd56eb534d4b80984130f44742196cab273b9c4 Mon Sep 17 00:00:00 2001
From 861ae1057019a5d8827a2dda7809616009d012ef 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] AFK API
@@ -266,7 +266,7 @@ index fc38163b1..cc08ad33e 100644
private static void timingsSettings() {
timingsUrl = getString("settings.timings.url", timingsUrl);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8c4b5f514..9ec1c5ce8 100644
index 361f7857e..2578a4677 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -56,4 +56,15 @@ public class PurpurWorldConfig {
@@ -286,10 +286,10 @@ index 8c4b5f514..9ec1c5ce8 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c7b4e5f2a..0ca6763ce 100644
index 8f2b84a84..e8c8ba74b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2143,4 +2143,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2149,4 +2149,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return spigot;
}
// Spigot end