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

Fix compilation issues (#1530)

Browse Source
This commit is contained in:
Krakenied
2024-06-17 01:52:10 +02:00
committed by GitHub
parent 6e1147f1ac
commit c9917352de
306 changed files with 1065 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0179-Customizable-sleeping-actionbar-messages.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Customizable sleeping actionbar messages
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index b8d80e04eea132d9671026e93e7c666d33dfeb25..74200fab686750cd53fc30edd050189cb11fe857 100644
index b2f066db2ac90ba53e0cc3c995316f49f7bc62ea..d1c98dcf2acb0a25f2537ee7f5cc183a0db2e64e 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1027,11 +1027,27 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -1026,11 +1026,27 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
if (this.canSleepThroughNights()) {
if (!this.getServer().isSingleplayer() || this.getServer().isPublished()) {
int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
@@ -38,7 +38,7 @@ index b8d80e04eea132d9671026e93e7c666d33dfeb25..74200fab686750cd53fc30edd050189c
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index f7402093e00e2d0f0fdd7ce81b91ae59ddae0005..cc902880e421260129d8daca6a9a9d7a13f27860 100644
index f3255cdfe9ff77be2b781056e39f35d506aafeb2..136635fa74c099e74d75f1d3ca093514329bf3dc 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1570,7 +1570,19 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -63,10 +63,10 @@ index f7402093e00e2d0f0fdd7ce81b91ae59ddae0005..cc902880e421260129d8daca6a9a9d7a
((ServerLevel) this.level()).updateSleepingPlayerList();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index c77691aeb9d0c35fe042a6e375e12d042091d17a..74b1153454ae75653706913c993781c462d95689 100644
index 1e84cbc4184234a83ed972fc449f2e0dd40f36ef..e61adb459d148390851607c6ea7cf710344b26e8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -186,6 +186,9 @@ public class PurpurConfig {
@@ -188,6 +188,9 @@ public class PurpurConfig {
public static String dontRunWithScissors = "<red><italic>Don't run with scissors!";
public static String uptimeCommandOutput = "<green>Server uptime is <uptime>";
public static String unverifiedUsername = "default";
@@ -76,7 +76,7 @@ index c77691aeb9d0c35fe042a6e375e12d042091d17a..74b1153454ae75653706913c993781c4
private static void messages() {
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
@@ -200,6 +203,9 @@ public class PurpurConfig {
@@ -202,6 +205,9 @@ public class PurpurConfig {
dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors);
uptimeCommandOutput = getString("settings.messages.uptime-command-output", uptimeCommandOutput);
unverifiedUsername = getString("settings.messages.unverified-username", unverifiedUsername);