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

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/0184-Add-compass-command.patch
View File

@@ -17,7 +17,7 @@ index 938f0cc6631e5fdf687f43c1adc850d778227e98..1beb75aa960c766344f00fa898f905d5
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 cc902880e421260129d8daca6a9a9d7a13f27860..4ab562eaeb21b0ed8ee4fdedfe22259e76dd3e68 100644
index 136635fa74c099e74d75f1d3ca093514329bf3dc..4af01ae458e5a79c20725b22b532710a66ba8f43 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -303,6 +303,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -44,7 +44,7 @@ index cc902880e421260129d8daca6a9a9d7a13f27860..4ab562eaeb21b0ed8ee4fdedfe22259e
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -3081,5 +3084,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -3083,5 +3086,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}
@@ -59,10 +59,10 @@ index cc902880e421260129d8daca6a9a9d7a13f27860..4ab562eaeb21b0ed8ee4fdedfe22259e
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 74b1153454ae75653706913c993781c462d95689..c1e7dc324237eea16e88a1fc636d5bcdf49a2b0c 100644
index e61adb459d148390851607c6ea7cf710344b26e8..21dff6a902b3c4e0fb40e61b4974ead7a6c920f2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -255,6 +255,11 @@ public class PurpurConfig {
@@ -257,6 +257,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 74b1153454ae75653706913c993781c462d95689..c1e7dc324237eea16e88a1fc636d5bcd
public static boolean commandGamemodeRequiresPermission = false;
public static boolean hideHiddenPlayersFromEntitySelector = false;
public static String uptimeFormat = "<days><hours><minutes><seconds>";
@@ -277,6 +282,13 @@ public class PurpurConfig {
@@ -279,6 +284,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 74b1153454ae75653706913c993781c462d95689..c1e7dc324237eea16e88a1fc636d5bcd
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 6c0dacb0a8ab5cfbba9880f2f9c8c6f1c60f3744..4b42e9f08914a94fe208fb3d4eba8ade0c7f23de 100644
index af53cf014a45bd012b735e73f44dfcb661fdbb3f..96e366d6f12671b580f83f428e07d08c221b888b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -207,6 +207,7 @@ public class PurpurWorldConfig {