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

Fix entity selectors with tpsbar command

Browse Source
This commit is contained in:
BillyGalbreath
2022-02-15 14:46:21 -06:00
parent d413f6f631
commit b829f5019a
22 changed files with 124 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0214-Add-compass-command.patch
View File

@@ -17,7 +17,7 @@ index e787ccc3c21f7e966c1e291579bf7550ee6de696..a4ec8c35c1870810c11e81e79c3b191c
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 6d643998ee32de7f96b94e10fbd0b08a75628978..e2e83d8b39ddb154c0e69b63d5b996644926ac43 100644
index 38a01e62ca99da9d8453b6275c5a1b22fcfa9b9e..f300589fad36c5c9768474a13db74144b760c2a5 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -257,6 +257,7 @@ public class ServerPlayer extends Player {
@@ -59,10 +59,10 @@ index 6d643998ee32de7f96b94e10fbd0b08a75628978..e2e83d8b39ddb154c0e69b63d5b99664
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 04766db12cc667ce312146aa7403fa9788e459cf..1b3121b780aceac7689ece96f1e8476e2d9ab104 100644
index 7c0b24c6dbd989697c7fa258f6d7f7b35f5b1d2e..f59247132b92abafc20437f958b69a7964676423 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -263,6 +263,11 @@ public class PurpurConfig {
@@ -265,6 +265,11 @@ public class PurpurConfig {
public static String commandTPSBarTextColorMedium = "<gradient:#ffff55:#ffaa00><text></gradient>";
public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
public static int commandTPSBarTickInterval = 20;
@@ -74,7 +74,7 @@ index 04766db12cc667ce312146aa7403fa9788e459cf..1b3121b780aceac7689ece96f1e8476e
public static boolean commandGamemodeRequiresPermission = false;
public static boolean hideHiddenPlayersFromEntitySelector = false;
public static String uptimeFormat = "<days><hours><minutes><seconds>";
@@ -285,6 +290,13 @@ public class PurpurConfig {
@@ -287,6 +292,13 @@ public class PurpurConfig {
commandTPSBarTextColorMedium = getString("settings.command.tpsbar.text-color.medium", commandTPSBarTextColorMedium);
commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);
@@ -89,7 +89,7 @@ index 04766db12cc667ce312146aa7403fa9788e459cf..1b3121b780aceac7689ece96f1e8476e
hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a3d23ed9223b78311d5f1441c0ce2341515c976c..a0b11159a84b901696c288c7e48e6b11430761d1 100644
index e213ab6708ab18568cae1387c4c0608f2f23af5c..7fb4ee9e72d001da6a372d91392a87cdff7bbf20 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -214,6 +214,7 @@ public class PurpurWorldConfig {