Fix compilation issues (#1530)

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

View File

@@ -17,7 +17,7 @@ index b286b157bba78021efa18f01bc91b067b0bd5874..fc87e3cfff1221a6cbaf3463ce972870
// Paper end
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index e7b07482d7a00bc1704b79b102cc1ad36fb06368..f7402093e00e2d0f0fdd7ce81b91ae59ddae0005 100644
index 8bb9692f37f2f0cfa7964963aacbc57b67a2708b..f3255cdfe9ff77be2b781056e39f35d506aafeb2 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1081,6 +1081,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -29,10 +29,10 @@ index e7b07482d7a00bc1704b79b102cc1ad36fb06368..f7402093e00e2d0f0fdd7ce81b91ae59
if (scoreboardteam.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
this.server.getPlayerList().broadcastSystemToTeam(this, ichatbasecomponent);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 62b375aee2703d573b728872d6b2f9d35e9c1f24..8c7295297830cdcab87ac8bb1f1e04987a5f0f25 100644
index 40f1a5aeea97c192488bedb00b7e565f6a32c9f1..6bf78e331f654ef8795bbc739dc310d366fddd19 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -203,6 +203,18 @@ public class PurpurConfig {
@@ -205,6 +205,18 @@ public class PurpurConfig {
deathMsgRunWithScissors = getString("settings.messages.death-message.run-with-scissors", deathMsgRunWithScissors);
}