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

Tell players about running with scissors

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-05 19:00:05 -05:00
parent b2fe934713
commit 2655657046
19 changed files with 116 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
patches/server/0004-Component-related-conveniences.patch
View File

@@ -4,6 +4,37 @@ Date: Tue, 29 Jun 2021 21:37:40 -0500
Subject: [PATCH] Component related conveniences
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 0da2dbeba93d428a035872e05177ed3fc29acf9b..f3d23ced47e7dd7bc4005379962a9efcb8edf084 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1677,6 +1677,26 @@ public class ServerPlayer extends Player {
}
// CraftBukkit end
+ // Purpur start
+ public void sendActionBarMessage(@Nullable String message) {
+ if (message != null) {
+ sendActionBarMessage(net.kyori.adventure.text.minimessage.MiniMessage.get().parse(message));
+ }
+ }
+
+ public void sendActionBarMessage(@Nullable net.kyori.adventure.text.Component message) {
+ if (message != null) {
+ sendActionBarMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message));
+ }
+ }
+
+ public void sendActionBarMessage(@Nullable Component message) {
+ if (message != null) {
+ displayClientMessage(message, true);
+ }
+ }
+ // Purpur end
+
@Override
public void displayClientMessage(Component message, boolean actionBar) {
this.sendMessage(message, actionBar ? ChatType.GAME_INFO : ChatType.CHAT, Util.NIL_UUID);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 570cea8ee6a442b2dc3c6ef849294ef0c02027ca..ec98fb6d4a407d5be8faf64db0d73e935e16623d 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java

6
patches/server/0005-Ridables.patch
View File

@@ -34,7 +34,7 @@ index 4cc099b469a7554e381a6f7aceb686a94f7d6605..06177ec182d79cd101da9cd43a841656
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index a83b4e9b6b5bd6a57d4bc2f1cdc78ffb7e7d2fdd..26c39cb0cd5e3c22825067f0d0d439c1044955a2 100644
index 57163e3cb883ded5861e57c3ca03663c02ee7492..67cdf31f3ce9f85743ce10bd2dee6854be1d69f9 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -205,6 +205,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -46,7 +46,7 @@ index a83b4e9b6b5bd6a57d4bc2f1cdc78ffb7e7d2fdd..26c39cb0cd5e3c22825067f0d0d439c1
return new Throwable(entity + " Added to world at " + new java.util.Date());
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 0da2dbeba93d428a035872e05177ed3fc29acf9b..56a60f26695cc888ee3f1f394f7d6108a3426071 100644
index f3d23ced47e7dd7bc4005379962a9efcb8edf084..fde98f9c4a3e151dbc277541fbd2cc0a8d957069 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -668,6 +668,15 @@ public class ServerPlayer extends Player {
@@ -65,7 +65,7 @@ index 0da2dbeba93d428a035872e05177ed3fc29acf9b..56a60f26695cc888ee3f1f394f7d6108
}
public void doTick() {
@@ -2384,4 +2393,6 @@ public class ServerPlayer extends Player {
@@ -2404,4 +2413,6 @@ public class ServerPlayer extends Player {
return (CraftPlayer) super.getBukkitEntity();
}
// CraftBukkit end

4
patches/server/0011-AFK-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 56a60f26695cc888ee3f1f394f7d6108a3426071..4713ca7eaa178916508476472a2ca899c6587dc2 100644
index fde98f9c4a3e151dbc277541fbd2cc0a8d957069..011ebba656174cb415d43244c50db250fa8f0a30 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1932,8 +1932,58 @@ public class ServerPlayer extends Player {
@@ -1952,8 +1952,58 @@ public class ServerPlayer extends Player {
public void resetLastActionTime() {
this.lastActionTime = Util.getMillis();

13
patches/server/0019-Player-invulnerabilities.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 4713ca7eaa178916508476472a2ca899c6587dc2..44b0e610fa2eb5f73a74bfadefc3f58bd20d6f6d 100644
index 011ebba656174cb415d43244c50db250fa8f0a30..1653928faba2422bfa5fff93be5b4d8f9c9447ed 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -338,6 +338,7 @@ public class ServerPlayer extends Player {
@@ -46,24 +46,25 @@ index 4713ca7eaa178916508476472a2ca899c6587dc2..44b0e610fa2eb5f73a74bfadefc3f58b
return this;
}
}
@@ -2395,8 +2403,16 @@ public class ServerPlayer extends Player {
@@ -2415,9 +2423,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
- return super.isImmobile() || (this.connection != null && this.connection.isDisconnected()); // Paper
+ return super.isImmobile() || frozen || (this.connection != null && this.connection.isDisconnected()); // Paper // Purpur
+ }
+
}
+ // Purpur start
+ private boolean frozen = false;
+
+ public void setFrozen(boolean frozen) {
+ this.frozen = frozen;
}
+ }
+ // Purpur end
+
@Override
public Scoreboard getScoreboard() {
return this.getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 210b774eae5d76823e171016e9e6b706e8da4f07..550ff06264aa4fffdd9b9291efec121ac034d963 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java

4
patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 30db21164b63d72b9bf6be38867cdcfdbd3c702b..8d427389756f173264da9d0da7b413763c41842a 100644
index 135f13864a85934c0127aa059bfe6c0e25140dfc..2cfd9895b9a371e731b416ec8745aae839e0054b 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2462,5 +2462,25 @@ public class ServerPlayer extends Player {
@@ -2482,5 +2482,25 @@ public class ServerPlayer extends Player {
}
// CraftBukkit end

27
patches/server/0161-Dont-run-with-scissors.patch
View File

@@ -5,24 +5,45 @@ Subject: [PATCH] Dont run with scissors!
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 5f6def82949d62bdfc74bcd15dffb4d946c20354..00d36af8db88f314bed2904386f1b827d5ec082e 100644
index 25c5d4c7c2db31c7a8c04a862928c6743ab5b130..9a2da610017064c914f84701f2b83d70f887acdb 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1575,6 +1575,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -1575,6 +1575,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
this.player.fallDistance = 0.0F;
}
+ // Purpur Start
+ if (this.player.isSprinting() && this.player.level.purpurConfig.dontRunWithScissors && (this.player.getItemInHand(InteractionHand.MAIN_HAND).getItem() == Items.SHEARS || this.player.getItemInHand(InteractionHand.OFF_HAND).getItem() == Items.SHEARS) && (int) (Math.random() * 10) == 0) {
+ this.player.hurt(net.minecraft.world.damagesource.DamageSource.MAGIC, (float) this.player.level.purpurConfig.scissorsRunningDamage);
+ if (!net.pl3x.purpur.PurpurConfig.dontRunWithScissors.isBlank()) this.player.sendActionBarMessage(net.pl3x.purpur.PurpurConfig.dontRunWithScissors);
+ }
+ // Purpur End
+
this.player.checkMovementStatistics(this.player.getX() - d3, this.player.getY() - d4, this.player.getZ() - d5);
this.lastGoodX = this.player.getX();
this.lastGoodY = this.player.getY();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 00a5c65439a30499156a10b1822760fe48ee7776..3b68981645eb70df8828d437411564e88ed88ee0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -163,6 +163,7 @@ public class PurpurConfig {
public static String creditsCommandOutput = "<green>%s has been shown the end credits";
public static String demoCommandOutput = "<green>%s has been shown the demo screen";
public static String pingCommandOutput = "<green>%s's ping is %sms";
+ public static String dontRunWithScissors = "<red><italic>Don't run with scissors!";
private static void messages() {
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
@@ -172,6 +173,7 @@ public class PurpurConfig {
creditsCommandOutput = getString("settings.messages.credits-command-output", creditsCommandOutput);
demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
+ dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors);
}
public static int seedFeatureBamboo = -1;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5b9998121d52d2b8390b95f1a4449ddadf543c22..b12404430997b17139324aef7ea61cc56682c51f 100644
index 3167b821798428e955daa421ca121b3403bc7ff4..a9fd8ebf763b379a203c17a54fce5e841249d5ca 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -153,6 +153,8 @@ public class PurpurWorldConfig {

6
patches/server/0176-Allow-infinity-on-crossbows.patch
View File

@@ -59,10 +59,10 @@ index 6f6106ca4d74d50a7b74b086adc96c58c7906cb6..d6417c1e77ac8823e18a179dc9f61757
public abstract boolean canEnchant(Item item);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 9d2b3f57779b1bc9732636a4618ef58ce7f6f722..ec9c2d5ed7ee5ab2681b0364c4d2395481ea5585 100644
index 3b68981645eb70df8828d437411564e88ed88ee0..205c63aa343d814914a34df6b082de28405a9728 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -344,6 +344,7 @@ public class PurpurConfig {
@@ -346,6 +346,7 @@ public class PurpurConfig {
}
public static boolean allowInfinityMending = false;
@@ -70,7 +70,7 @@ index 9d2b3f57779b1bc9732636a4618ef58ce7f6f722..ec9c2d5ed7ee5ab2681b0364c4d23954
private static void enchantmentSettings() {
if (version < 5) {
boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
@@ -351,6 +352,7 @@ public class PurpurConfig {
@@ -353,6 +354,7 @@ public class PurpurConfig {
set("settings.enchantment.allow-infinite-and-mending-together", null);
}
allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);

6
patches/server/0182-Config-to-allow-for-unsafe-enchants.patch
View File

@@ -75,10 +75,10 @@ index 5bd25f8b8a554b965665b3f5686c14189b51f28e..4be9924556e0f447dbe6a53c2d4cb7fb
this.getOrCreateTag().put(key, tag);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index ec9c2d5ed7ee5ab2681b0364c4d2395481ea5585..4216dd6d71dfa3bffa97bc5d86a9ab30337bb8bd 100644
index 205c63aa343d814914a34df6b082de28405a9728..1fc3f6b22fcde88b36759b587e5cf7d2b28ebd30 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -345,6 +345,7 @@ public class PurpurConfig {
@@ -347,6 +347,7 @@ public class PurpurConfig {
public static boolean allowInfinityMending = false;
public static boolean allowCrossbowInfinity = false;
@@ -86,7 +86,7 @@ index ec9c2d5ed7ee5ab2681b0364c4d2395481ea5585..4216dd6d71dfa3bffa97bc5d86a9ab30
private static void enchantmentSettings() {
if (version < 5) {
boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
@@ -353,6 +354,7 @@ public class PurpurConfig {
@@ -355,6 +356,7 @@ public class PurpurConfig {
}
allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);

6
patches/server/0187-Config-to-change-max-number-of-bees.patch
View File

@@ -18,10 +18,10 @@ index 8484e80a70129fb0358d56efab6fd54798b54e6e..ffacc4b8cc3ab8285c4131aec58e48ff
public BeehiveBlockEntity(BlockPos pos, BlockState state) {
super(BlockEntityType.BEEHIVE, pos, state);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4216dd6d71dfa3bffa97bc5d86a9ab30337bb8bd..aa218a0f98c0cbb5f663f217baba73d9f6c29740 100644
index 1fc3f6b22fcde88b36759b587e5cf7d2b28ebd30..71d252353662e6af2d05dad4e093b7930f86c163 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -326,6 +326,7 @@ public class PurpurConfig {
@@ -328,6 +328,7 @@ public class PurpurConfig {
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
public static boolean cryingObsidianValidForPortalFrame = false;
@@ -29,7 +29,7 @@ index 4216dd6d71dfa3bffa97bc5d86a9ab30337bb8bd..aa218a0f98c0cbb5f663f217baba73d9
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -341,6 +342,7 @@ public class PurpurConfig {
@@ -343,6 +344,7 @@ public class PurpurConfig {
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);

4
patches/server/0190-Gamemode-extra-permissions.patch
View File

@@ -54,10 +54,10 @@ index 79f6089b934124c3309c6bee2e48b36b937252e0..dff8ef0a1a2e52792070d93685c29002
for(ServerPlayer serverPlayer : targets) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index aa218a0f98c0cbb5f663f217baba73d9f6c29740..bc46e80e8dbe82d495d73a1b32bba763c0ca9715 100644
index 71d252353662e6af2d05dad4e093b7930f86c163..2d01b22bce83431904869b714e77c783aa394533 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -322,6 +322,11 @@ public class PurpurConfig {
@@ -324,6 +324,11 @@ public class PurpurConfig {
disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops);
}

8
patches/server/0193-Configurable-broadcast-settings.patch
View File

@@ -17,7 +17,7 @@ index c46df052a5a39d92688f51377ee1f7b5b5b36faa..d7d2a975386cecb0d50b4f7ed37de8ad
// 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 02d20650dd74b93efb47f07fea7265e1ae32c726..4241087ad7b0d9f1f6705d88c9484fdd9bc80669 100644
index d4be590e81a966eddfdf8c7d9c8849435f29bdcf..745fddc22edefc012d0897a0d79fe2563646fc27 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -879,6 +879,7 @@ public class ServerPlayer extends Player {
@@ -29,11 +29,11 @@ index 02d20650dd74b93efb47f07fea7265e1ae32c726..4241087ad7b0d9f1f6705d88c9484fdd
if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
this.server.getPlayerList().broadcastToTeam((Player) this, ichatbasecomponent);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 98a05bf2a69278030f6643f82b601b363948a404..bc1535bf55852c89c2abf446b125b8bcc83f9279 100644
index 2d01b22bce83431904869b714e77c783aa394533..c558668ba8bfd49b17a9faabe74f62d6972251d5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -174,6 +174,18 @@ public class PurpurConfig {
pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
@@ -176,6 +176,18 @@ public class PurpurConfig {
dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors);
}
+ public static boolean advancementOnlyBroadcastToAffectedPlayer = false;

4
patches/server/0196-Hide-hidden-players-from-entity-selector.patch
View File

@@ -59,10 +59,10 @@ index 0fb8f32427843f4bfd90ab88ecb3ab3e4a4fda31..f99f1ba7f912a2fd503e12c446b342a8
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 246246836aa03801fe23495edb720d03562e26f0..76de3ed4b13b4c6b00656021236a7da5aaa0eaa2 100644
index c558668ba8bfd49b17a9faabe74f62d6972251d5..f03bc3f08c2618f4eb3222f8663a3b961dcf56b5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -335,8 +335,10 @@ public class PurpurConfig {
@@ -337,8 +337,10 @@ public class PurpurConfig {
}
public static boolean commandGamemodeRequiresPermission = false;

10
patches/server/0203-Config-for-unverified-username-message.patch
View File

@@ -18,21 +18,21 @@ index 5d26417b5d4e182fdefdf1ef5c81a0b7d7f2d4c1..43090b05642d252fd5b3d4a65149beab
}
} catch (AuthenticationUnavailableException authenticationunavailableexception) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 76de3ed4b13b4c6b00656021236a7da5aaa0eaa2..ccb10099d8b744effc772b738f84137c236c1e91 100644
index f03bc3f08c2618f4eb3222f8663a3b961dcf56b5..98db9a917c0dc464c1c0efffa4059369208a930d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -163,6 +163,7 @@ public class PurpurConfig {
public static String creditsCommandOutput = "<green>%s has been shown the end credits";
@@ -164,6 +164,7 @@ public class PurpurConfig {
public static String demoCommandOutput = "<green>%s has been shown the demo screen";
public static String pingCommandOutput = "<green>%s's ping is %sms";
public static String dontRunWithScissors = "<red><italic>Don't run with scissors!";
+ public static String unverifiedUsername = "default";
private static void messages() {
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
@@ -172,6 +173,7 @@ public class PurpurConfig {
creditsCommandOutput = getString("settings.messages.credits-command-output", creditsCommandOutput);
@@ -174,6 +175,7 @@ public class PurpurConfig {
demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors);
+ unverifiedUsername = getString("settings.messages.unverified-username", unverifiedUsername);
}

6
patches/server/0204-Make-anvil-cumulative-cost-configurable.patch
View File

@@ -18,10 +18,10 @@ index 168f16f3117b6b18279cbe597a32221bc04a0648..5c1a72a402895f2166a3f36691253d80
public void setItemName(String newItemName) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index ccb10099d8b744effc772b738f84137c236c1e91..b42f87fad204dd21ba843b78c1f6710e95452a3a 100644
index 98db9a917c0dc464c1c0efffa4059369208a930d..c96df4d7ccb61accec8374c8dc820ddacafb3113 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -348,6 +348,7 @@ public class PurpurConfig {
@@ -350,6 +350,7 @@ public class PurpurConfig {
public static boolean enderChestPermissionRows = false;
public static boolean cryingObsidianValidForPortalFrame = false;
public static int beeInsideBeeHive = 3;
@@ -29,7 +29,7 @@ index ccb10099d8b744effc772b738f84137c236c1e91..b42f87fad204dd21ba843b78c1f6710e
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -364,6 +365,7 @@ public class PurpurConfig {
@@ -366,6 +367,7 @@ public class PurpurConfig {
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);

8
patches/server/0214-Make-lightning-rod-range-configurable.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Make lightning rod range configurable
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 9f37cc84cbbefd96dd64ae4c811d0257829de649..dbf9d73027320efeed5fda3a610281fd737540df 100644
index 68255224e72ae5e7e5eec88c2c29be0dfda64147..7f81ac2cd975b17fc2f3d4bc21111515658663ae 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1046,7 +1046,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -18,10 +18,10 @@ index 9f37cc84cbbefd96dd64ae4c811d0257829de649..dbf9d73027320efeed5fda3a610281fd
return optional.map((blockposition1) -> {
return blockposition1.above(1);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 06a560864e43e60ad13db17c4ffdc006381f5511..9b730c8e14d4ccbb46977bd2026c466a78008ec4 100644
index c96df4d7ccb61accec8374c8dc820ddacafb3113..0b0ed9e5a6625fc270d90fb8fdd0b93897d1507d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -349,6 +349,7 @@ public class PurpurConfig {
@@ -351,6 +351,7 @@ public class PurpurConfig {
public static boolean cryingObsidianValidForPortalFrame = false;
public static int beeInsideBeeHive = 3;
public static boolean anvilCumulativeCost = true;
@@ -29,7 +29,7 @@ index 06a560864e43e60ad13db17c4ffdc006381f5511..9b730c8e14d4ccbb46977bd2026c466a
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -366,6 +367,7 @@ public class PurpurConfig {
@@ -368,6 +369,7 @@ public class PurpurConfig {
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);

12
patches/server/0225-Add-uptime-command.patch
View File

@@ -29,26 +29,26 @@ index 108dadb24607ea42cf857879386c34c9bb72dbee..a87be8fe6fbed952bfee76bab49e313b
public int autosavePeriod;
public boolean serverAutoSave = false; // Paper
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 9b730c8e14d4ccbb46977bd2026c466a78008ec4..fb2e07475386a8af27618b597bd8573244e30a4a 100644
index 0b0ed9e5a6625fc270d90fb8fdd0b93897d1507d..64a719cce811d63f84d5ba5c67549c8caba6ede1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -163,6 +163,7 @@ public class PurpurConfig {
public static String creditsCommandOutput = "<green>%s has been shown the end credits";
@@ -164,6 +164,7 @@ public class PurpurConfig {
public static String demoCommandOutput = "<green>%s has been shown the demo screen";
public static String pingCommandOutput = "<green>%s's ping is %sms";
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";
private static void messages() {
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
@@ -173,6 +174,7 @@ public class PurpurConfig {
creditsCommandOutput = getString("settings.messages.credits-command-output", creditsCommandOutput);
@@ -175,6 +176,7 @@ public class PurpurConfig {
demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors);
+ uptimeCommandOutput = getString("settings.messages.uptime-command-output", uptimeCommandOutput);
unverifiedUsername = getString("settings.messages.unverified-username", unverifiedUsername);
}
@@ -338,9 +340,27 @@ public class PurpurConfig {
@@ -340,9 +342,27 @@ public class PurpurConfig {
public static boolean commandGamemodeRequiresPermission = false;
public static boolean hideHiddenPlayersFromEntitySelector = false;

6
patches/server/0226-Structure-seed-options.patch
View File

@@ -27,10 +27,10 @@ index 6cd66a4edbe2010d2a34506baf1ba6fe3de38bb9..f3e67330c01f6a867ccd4e024a6695d9
updated.put(entry.getKey(), new StructureFeatureConfiguration(feature.spacing(), feature.separation(), seed));
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index fb2e07475386a8af27618b597bd8573244e30a4a..a81d328e209c8161446b94dd2e78197a4c6a891f 100644
index 64a719cce811d63f84d5ba5c67549c8caba6ede1..a9675c496dd5f1abc695370a822b8a3e025f8f83 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -243,6 +243,9 @@ public class PurpurConfig {
@@ -245,6 +245,9 @@ public class PurpurConfig {
public static int seedFeatureVegetationPatch = -1;
public static int seedFeatureWaterloggedVegetationPatch = -1;
public static int seedFeatureWeepingVines = -1;
@@ -40,7 +40,7 @@ index fb2e07475386a8af27618b597bd8573244e30a4a..a81d328e209c8161446b94dd2e78197a
private static void seedSettings() {
if (version < 14) {
int oldValue = getInt("settings.seed.dungeon", -1);
@@ -308,6 +311,9 @@ public class PurpurConfig {
@@ -310,6 +313,9 @@ public class PurpurConfig {
seedFeatureVegetationPatch = getInt("settings.seed.feature.vegetation_patch", seedFeatureVegetationPatch);
seedFeatureWaterloggedVegetationPatch = getInt("settings.seed.feature.waterlogged_vegetation_patch", seedFeatureWaterloggedVegetationPatch);
seedFeatureWeepingVines = getInt("settings.seed.feature.weeping_vines", seedFeatureWeepingVines);

6
patches/server/0228-SPIGOT-5988-Fix-bed-respawn-location-not-resetting.patch
View File

@@ -17,10 +17,10 @@ index a4af10623511bfbbf9ef799d5727c6e1752a2fa5..75ea35574ad999fd7f6cce4b794017eb
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index a81d328e209c8161446b94dd2e78197a4c6a891f..b70a59e80c4861f8be6fd34b326140a6d3f917ed 100644
index a9675c496dd5f1abc695370a822b8a3e025f8f83..0d77130d4fbd12dbed5cce84a041a41db41351dd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -376,6 +376,7 @@ public class PurpurConfig {
@@ -378,6 +378,7 @@ public class PurpurConfig {
public static int beeInsideBeeHive = 3;
public static boolean anvilCumulativeCost = true;
public static int lightningRodRange = 128;
@@ -28,7 +28,7 @@ index a81d328e209c8161446b94dd2e78197a4c6a891f..b70a59e80c4861f8be6fd34b326140a6
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -394,6 +395,7 @@ public class PurpurConfig {
@@ -396,6 +397,7 @@ public class PurpurConfig {
beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange);

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

@@ -5,7 +5,7 @@ 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 dbf9d73027320efeed5fda3a610281fd737540df..42f6664ea6ddb3892b4549a78755efccd6f0f329 100644
index 7f81ac2cd975b17fc2f3d4bc21111515658663ae..05635818b4ae597b6b2053dbf9c8351f6ea9ea42 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -4,6 +4,7 @@ import com.google.common.annotations.VisibleForTesting;
@@ -66,11 +66,11 @@ index dbf9d73027320efeed5fda3a610281fd737540df..42f6664ea6ddb3892b4549a78755efcc
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index b70a59e80c4861f8be6fd34b326140a6d3f917ed..209ddb614b98edcf340b49c1f12331bf169f8058 100644
index 0d77130d4fbd12dbed5cce84a041a41db41351dd..f90256ef0806a61c434a0d062318267184177283 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -165,6 +165,8 @@ public class PurpurConfig {
public static String pingCommandOutput = "<green>%s's ping is %sms";
@@ -166,6 +166,8 @@ 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";
+ public static String sleepSkippingNight = "default";
@@ -78,8 +78,8 @@ index b70a59e80c4861f8be6fd34b326140a6d3f917ed..209ddb614b98edcf340b49c1f12331bf
private static void messages() {
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
@@ -176,6 +178,8 @@ public class PurpurConfig {
pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
@@ -178,6 +180,8 @@ 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);
+ sleepSkippingNight = getString("settings.messages.sleep-skipping-night", sleepSkippingNight);