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

Move more options to per-world section (still more to come)

Browse Source
This commit is contained in:
William Blake Galbreath
2020-01-14 19:33:01 -06:00
parent bee0cc833b
commit a221240eef
35 changed files with 298 additions and 298 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 3a01733c19a4960d0e0ff4e512234666fd0aae84 Mon Sep 17 00:00:00 2001
From bc8b7d1ee0c0ad83ae767780dfeb5beb58a6d299 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
@@ -205,7 +205,7 @@ index a4af019bc6..2db59c55ca 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 a299fbf96a..bc02c54526 100644
index fbfe37ea0a..4dfcce82de 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -376,7 +376,7 @@ public class WorldServer extends World {
@@ -227,7 +227,7 @@ index a299fbf96a..bc02c54526 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 06d6275809..259f6fa287 100644
index d2879d3833..17950a8245 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,6 +1,7 @@
@@ -238,8 +238,8 @@ index 06d6275809..259f6fa287 100644
import org.bukkit.configuration.file.YamlConfiguration;
import org.spigotmc.SpigotWorldConfig;
@@ -132,6 +133,21 @@ public class PurpurWorldConfig {
elytraDamagePerTridentBoost = getInt("elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
@@ -109,6 +110,21 @@ public class PurpurWorldConfig {
allowSignColors = getBoolean("allow-sign-colors", allowSignColors);
}
+ public boolean idleTimeoutKick = true;
@@ -257,9 +257,9 @@ index 06d6275809..259f6fa287 100644
+ idleTimeoutBroadcastBack = ChatColor.translateAlternateColorCodes('&', getString("idle-timeout.broadcast.back", idleTimeoutBroadcastBack));
+ }
+
public int pillagerLimitOutpostSpawns = 10;
private void pillagerSettings() {
pillagerLimitOutpostSpawns = getInt("mobs.pillager.limit-outpost-spawns", pillagerLimitOutpostSpawns);
public boolean itemsCanBreakTurtleEggs = false;
private void itemsCanBreakTurtleEggs() {
itemsCanBreakTurtleEggs = getBoolean("items-can-break-turtle-eggs", itemsCanBreakTurtleEggs);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3afcfeae11..df9e5c6593 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java