Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix /purpur reload not reloading world options

Browse Source
This commit is contained in:
William Blake Galbreath
2020-01-14 20:58:59 -06:00
parent e4b55a3da2
commit 535006bd94
34 changed files with 142 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 8a2bf04d29d12fb3d670201238c371031227ec52 Mon Sep 17 00:00:00 2001
From d06261552766977bb5db6c507bc22df984eceea6 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
@@ -11,10 +11,10 @@ Subject: [PATCH] Implement AFK API
.../net/minecraft/server/IEntitySelector.java | 2 +
.../minecraft/server/PlayerConnection.java | 10 +++++
.../net/minecraft/server/WorldServer.java | 4 +-
.../net/pl3x/purpur/PurpurWorldConfig.java | 16 +++++++
.../net/pl3x/purpur/PurpurWorldConfig.java | 15 +++++++
.../craftbukkit/entity/CraftPlayer.java | 17 ++++++++
.../java/org/spigotmc/ActivationRange.java | 1 +
10 files changed, 113 insertions(+), 24 deletions(-)
10 files changed, 112 insertions(+), 24 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b9f678f26b..b502e589d4 100644
@@ -227,18 +227,10 @@ index fbfe37ea0a..4dfcce82de 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 d2879d3833..17950a8245 100644
index 6d875b78b9..7422f361e4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,6 +1,7 @@
package net.pl3x.purpur;
import com.destroystokyo.paper.PaperWorldConfig;
+import org.bukkit.ChatColor;
import org.bukkit.configuration.file.YamlConfiguration;
import org.spigotmc.SpigotWorldConfig;
@@ -109,6 +110,21 @@ public class PurpurWorldConfig {
@@ -106,6 +106,21 @@ public class PurpurWorldConfig {
allowSignColors = getBoolean("allow-sign-colors", allowSignColors);
}
@@ -253,8 +245,8 @@ index d2879d3833..17950a8245 100644
+ idleTimeoutTickNearbyEntities = getBoolean("idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
+ idleTimeoutCountAsSleeping = getBoolean("idle-timeout.count-as-sleeping", idleTimeoutCountAsSleeping);
+ idleTimeoutUpdateTabList = getBoolean("idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
+ idleTimeoutBroadcastAway = ChatColor.translateAlternateColorCodes('&', getString("idle-timeout.broadcast.away", idleTimeoutBroadcastAway));
+ idleTimeoutBroadcastBack = ChatColor.translateAlternateColorCodes('&', getString("idle-timeout.broadcast.back", idleTimeoutBroadcastBack));
+ idleTimeoutBroadcastAway = org.bukkit.ChatColor.translateAlternateColorCodes('&', getString("idle-timeout.broadcast.away", idleTimeoutBroadcastAway));
+ idleTimeoutBroadcastBack = org.bukkit.ChatColor.translateAlternateColorCodes('&', getString("idle-timeout.broadcast.back", idleTimeoutBroadcastBack));
+ }
+
public boolean itemsCanBreakTurtleEggs = false;