Skip to content

Commit 5b21691

Browse files
PascalpexPascalpex
committed
Begin 1.21.9 update
1 parent 5793a55 commit 5b21691

File tree

15 files changed

+111
-111
lines changed

15 files changed

+111
-111
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
uses: actions/[email protected]
2525
with:
2626
name: DeepslateMC
27-
path: deepslateMC-server/build/libs/deepslateMC-paperclip-1.21.8-R0.1-SNAPSHOT-mojmap.jar
27+
path: deepslateMC-server/build/libs/deepslateMC-paperclip-1.21.9-rc1-R0.1-SNAPSHOT-mojmap.jar

‎deepslateMC-server/minecraft-patches/features/0001-Dont-show-spectator-players-in-tablist.patch‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ Subject: [PATCH] Dont show spectator players in tablist
55

66

77
diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
8-
index 02c02314a4a6a7a6da427f0d064dbc61ce92301d..2a0385f0c7f99ac960982211fd2b85c154db7487 100644
8+
index 599d6a4f31e05369caf3ef9f5e54e83396743ec0..3bf5bef7bfd919b4decd26c52e1c3dc4499f1a4d 100644
99
--- a/net/minecraft/server/level/ServerPlayerGameMode.java
1010
+++ b/net/minecraft/server/level/ServerPlayerGameMode.java
11-
@@ -75,10 +75,16 @@ public class ServerPlayerGameMode {
12-
// CraftBukkit end
13-
this.setGameModeForPlayer(gameModeForPlayer, this.gameModeForPlayer); // Paper - Fix MC-259571
11+
@@ -86,10 +86,16 @@ public class ServerPlayerGameMode {
12+
}
13+
1414
this.player.onUpdateAbilities();
1515
- this.level
1616
- .getServer()
@@ -30,76 +30,76 @@ index 02c02314a4a6a7a6da427f0d064dbc61ce92301d..2a0385f0c7f99ac960982211fd2b85c1
3030
if (gameModeForPlayer == GameType.CREATIVE) {
3131
this.player.resetCurrentImpulseContext();
3232
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
33-
index b8356e6719c17020627a693f62e70c2ae066e5ea..2d0d8bd3cf88a45361e0fee819e488ff1dec8816 100644
33+
index 540a073f7738055f7d4eb0175ef1e5999c2d81e8..d8a15cbdfda6ad04b450c18e456460d2804c6770 100644
3434
--- a/net/minecraft/server/players/PlayerList.java
3535
+++ b/net/minecraft/server/players/PlayerList.java
36-
@@ -496,6 +496,25 @@ public abstract class PlayerList {
37-
// CraftBukkit start - sendAll above replaced with this loop
38-
ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player)); // Paper - Add Listing API for Player
36+
@@ -266,6 +266,25 @@ public abstract class PlayerList {
37+
// CraftBukkit start - sendAll above replaced with this loop
38+
ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player)); // Paper - Add Listing API for Player
3939

40-
+ // Deepslate start - Don't send spectator mode packets to other players
41-
+ ClientboundPlayerInfoUpdatePacket modifiedPacket = null;
42-
+ if (!de.pascalpex.deepslatemc.files.Config.getSendSpectatorModePackets()) {
43-
+ ClientboundPlayerInfoUpdatePacket.Entry entry = packet.entries().getFirst();
44-
+ ClientboundPlayerInfoUpdatePacket.Entry entryWithoutSpectator = new ClientboundPlayerInfoUpdatePacket.Entry(
45-
+ entry.profileId(),
46-
+ entry.profile(),
47-
+ entry.listed(),
48-
+ entry.latency(),
49-
+ entry.gameMode() == net.minecraft.world.level.GameType.SPECTATOR ? net.minecraft.world.level.GameType.SURVIVAL : entry.gameMode(),
50-
+ entry.displayName(),
51-
+ entry.showHat(),
52-
+ entry.listOrder(),
53-
+ entry.chatSession());
40+
+ // Deepslate start - Don't send spectator mode packets to other players
41+
+ ClientboundPlayerInfoUpdatePacket modifiedPacket = null;
42+
+ if (!de.pascalpex.deepslatemc.files.Config.getSendSpectatorModePackets()) {
43+
+ ClientboundPlayerInfoUpdatePacket.Entry entry = packet.entries().getFirst();
44+
+ ClientboundPlayerInfoUpdatePacket.Entry entryWithoutSpectator = new ClientboundPlayerInfoUpdatePacket.Entry(
45+
+ entry.profileId(),
46+
+ entry.profile(),
47+
+ entry.listed(),
48+
+ entry.latency(),
49+
+ entry.gameMode() == net.minecraft.world.level.GameType.SPECTATOR ? net.minecraft.world.level.GameType.SURVIVAL : entry.gameMode(),
50+
+ entry.displayName(),
51+
+ entry.showHat(),
52+
+ entry.listOrder(),
53+
+ entry.chatSession());
5454
+
55-
+ modifiedPacket = new ClientboundPlayerInfoUpdatePacket(packet.actions(), List.of(entryWithoutSpectator));
56-
+ }
57-
+ // Deepslate end - Don't send spectator mode packets to other players
55+
+ modifiedPacket = new ClientboundPlayerInfoUpdatePacket(packet.actions(), List.of(entryWithoutSpectator));
56+
+ }
57+
+ // Deepslate end - Don't send spectator mode packets to other players
5858
+
59-
final List<ServerPlayer> onlinePlayers = Lists.newArrayListWithExpectedSize(this.players.size() - 1); // Paper - Use single player info update packet on join
60-
for (int i = 0; i < this.players.size(); ++i) {
61-
ServerPlayer entityplayer1 = (ServerPlayer) this.players.get(i);
62-
@@ -504,7 +523,13 @@ public abstract class PlayerList {
63-
// Paper start - Add Listing API for Player
64-
if (entityplayer1.getBukkitEntity().isListed(bukkitPlayer)) {
65-
// Paper end - Add Listing API for Player
66-
- entityplayer1.connection.send(packet);
67-
+ // Deepslate start - Don't send spectator mode packets to other players
68-
+ if (de.pascalpex.deepslatemc.files.Config.getSendSpectatorModePackets() || entityplayer1 == player) {
69-
+ entityplayer1.connection.send(packet);
70-
+ } else {
71-
+ entityplayer1.connection.send(modifiedPacket);
72-
+ }
73-
+ // Deepslate end - Don't send spectator mode packets to other players
74-
// Paper start - Add Listing API for Player
75-
} else {
76-
entityplayer1.connection.send(ClientboundPlayerInfoUpdatePacket.createSinglePlayerInitializing(player, false));
77-
@@ -520,7 +545,27 @@ public abstract class PlayerList {
78-
}
79-
// Paper start - Use single player info update packet on join
80-
if (!onlinePlayers.isEmpty()) {
81-
- player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(onlinePlayers, player)); // Paper - Add Listing API for Player
82-
+ // Deepslate start - Don't send spectator mode packets to other players
83-
+ ClientboundPlayerInfoUpdatePacket updatePacket = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(onlinePlayers, player);
84-
+ if (!de.pascalpex.deepslatemc.files.Config.getSendSpectatorModePackets()) {
85-
+ List<ClientboundPlayerInfoUpdatePacket.Entry> newEntries = new java.util.ArrayList<>();
86-
+ for (ClientboundPlayerInfoUpdatePacket.Entry entry : updatePacket.entries()) {
87-
+ ClientboundPlayerInfoUpdatePacket.Entry newEntry = new ClientboundPlayerInfoUpdatePacket.Entry(
88-
+ entry.profileId(),
89-
+ entry.profile(),
90-
+ entry.listed(),
91-
+ entry.latency(),
92-
+ entry.gameMode() == net.minecraft.world.level.GameType.SPECTATOR ? net.minecraft.world.level.GameType.SURVIVAL : entry.gameMode(),
93-
+ entry.displayName(),
94-
+ entry.showHat(),
95-
+ entry.listOrder(),
96-
+ entry.chatSession());
97-
+ newEntries.add(newEntry);
59+
final List<ServerPlayer> onlinePlayers = Lists.newArrayListWithExpectedSize(this.players.size() - 1); // Paper - Use single player info update packet on join
60+
for (int i = 0; i < this.players.size(); ++i) {
61+
ServerPlayer entityplayer1 = (ServerPlayer) this.players.get(i);
62+
@@ -274,7 +293,13 @@ public abstract class PlayerList {
63+
// Paper start - Add Listing API for Player
64+
if (entityplayer1.getBukkitEntity().isListed(bukkitPlayer)) {
65+
// Paper end - Add Listing API for Player
66+
- entityplayer1.connection.send(packet);
67+
+ // Deepslate start - Don't send spectator mode packets to other players
68+
+ if (de.pascalpex.deepslatemc.files.Config.getSendSpectatorModePackets() || entityplayer1 == player) {
69+
+ entityplayer1.connection.send(packet);
70+
+ } else {
71+
+ entityplayer1.connection.send(modifiedPacket);
9872
+ }
99-
+ updatePacket = new ClientboundPlayerInfoUpdatePacket(updatePacket.actions(), newEntries);
73+
+ // Deepslate end - Don't send spectator mode packets to other players
74+
// Paper start - Add Listing API for Player
75+
} else {
76+
entityplayer1.connection.send(ClientboundPlayerInfoUpdatePacket.createSinglePlayerInitializing(player, false));
77+
@@ -290,7 +315,27 @@ public abstract class PlayerList {
78+
}
79+
// Paper start - Use single player info update packet on join
80+
if (!onlinePlayers.isEmpty()) {
81+
- player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(onlinePlayers, player)); // Paper - Add Listing API for Player
82+
+ // Deepslate start - Don't send spectator mode packets to other players
83+
+ ClientboundPlayerInfoUpdatePacket updatePacket = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(onlinePlayers, player);
84+
+ if (!de.pascalpex.deepslatemc.files.Config.getSendSpectatorModePackets()) {
85+
+ List<ClientboundPlayerInfoUpdatePacket.Entry> newEntries = new java.util.ArrayList<>();
86+
+ for (ClientboundPlayerInfoUpdatePacket.Entry entry : updatePacket.entries()) {
87+
+ ClientboundPlayerInfoUpdatePacket.Entry newEntry = new ClientboundPlayerInfoUpdatePacket.Entry(
88+
+ entry.profileId(),
89+
+ entry.profile(),
90+
+ entry.listed(),
91+
+ entry.latency(),
92+
+ entry.gameMode() == net.minecraft.world.level.GameType.SPECTATOR ? net.minecraft.world.level.GameType.SURVIVAL : entry.gameMode(),
93+
+ entry.displayName(),
94+
+ entry.showHat(),
95+
+ entry.listOrder(),
96+
+ entry.chatSession());
97+
+ newEntries.add(newEntry);
10098
+ }
101-
+ player.connection.send(updatePacket); // Paper - Add Listing API for Player
102-
+ // Deepslate end - Don't send spectator mode packets to other players
103-
}
104-
// Paper end - Use single player info update packet on join
105-
player.sentListPacket = true;
99+
+ updatePacket = new ClientboundPlayerInfoUpdatePacket(updatePacket.actions(), newEntries);
100+
+ }
101+
+ player.connection.send(updatePacket); // Paper - Add Listing API for Player
102+
+ // Deepslate end - Don't send spectator mode packets to other players
103+
}
104+
// Paper end - Use single player info update packet on join
105+
player.sentListPacket = true;

‎deepslateMC-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/commands/Commands.java
22
+++ b/net/minecraft/commands/Commands.java
3-
@@ -180,6 +_,10 @@
3+
@@ -182,6 +_,10 @@
44
}
55
public Commands(Commands.CommandSelection selection, CommandBuildContext context, final boolean modern) {
66
// Paper end - Brigadier API - modern minecraft overloads that do not use redirects but are copies instead
@@ -11,7 +11,7 @@
1111
AdvancementCommands.register(this.dispatcher);
1212
AttributeCommand.register(this.dispatcher, context);
1313
ExecuteCommand.register(this.dispatcher, context);
14-
@@ -203,7 +_,7 @@
14+
@@ -205,7 +_,7 @@
1515
GameModeCommand.register(this.dispatcher);
1616
GameRuleCommand.register(this.dispatcher, context);
1717
GiveCommand.register(this.dispatcher, context);
@@ -20,7 +20,7 @@
2020
ItemCommands.register(this.dispatcher, context);
2121
KickCommand.register(this.dispatcher);
2222
KillCommand.register(this.dispatcher);
23-
@@ -272,7 +_,9 @@
23+
@@ -273,7 +_,9 @@
2424
BanListCommands.register(this.dispatcher);
2525
BanPlayerCommands.register(this.dispatcher);
2626
DeOpCommands.register(this.dispatcher);

‎deepslateMC-server/minecraft-patches/sources/net/minecraft/server/Main.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/server/Main.java
22
+++ b/net/minecraft/server/Main.java
3-
@@ -69,6 +_,17 @@
3+
@@ -67,6 +_,17 @@
44
)
55
@DontObfuscate
66
public static void main(final OptionSet optionSet) { // CraftBukkit - replaces main(String[] args)

‎deepslateMC-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
--- a/net/minecraft/server/MinecraftServer.java
22
+++ b/net/minecraft/server/MinecraftServer.java
3-
@@ -1207,6 +_,7 @@
3+
@@ -1120,6 +_,7 @@
44
// Paper end
55
org.spigotmc.WatchdogThread.hasStarted = true; // Paper
66
org.dreeam.leaf.config.LeafConfig.regSparkExtraConfig(); // Leaf - Leaf config
77
+ de.pascalpex.deepslatemc.files.Config.addSparkEntry(); // Deepslate - add deepslate.yml to spark
88
Arrays.fill(this.recentTps, 20);
99
// Paper start - further improve server tick loop
1010
long tickSection = Util.getNanos();
11-
@@ -1665,6 +_,19 @@
11+
@@ -1578,6 +_,19 @@
1212
private ServerStatus.Players buildPlayerStatus() {
13-
List<ServerPlayer> players = this.playerList.realPlayers; // Leaves - only real player
13+
List<ServerPlayer> players = this.playerList.getPlayers();
1414
int maxPlayers = this.getMaxPlayers();
1515
+
1616
+ // Deepslate start - Custom playerlist hover text
@@ -28,7 +28,7 @@
2828
if (this.hidesOnlinePlayers()) {
2929
return new ServerStatus.Players(maxPlayers, players.size(), List.of());
3030
} else {
31-
@@ -2099,7 +_,18 @@
31+
@@ -1959,7 +_,18 @@
3232

3333
public void setMotd(String motd) {
3434
// Paper start - Adventure

‎deepslateMC-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/server/dedicated/DedicatedServer.java
22
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
3-
@@ -187,6 +_,8 @@
3+
@@ -280,6 +_,8 @@
44
thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
55
io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
66
org.dreeam.leaf.command.LeafCommands.registerCommands(this); // Leaf - Leaf commands

‎deepslateMC-server/minecraft-patches/sources/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
22
+++ b/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
3-
@@ -93,9 +_,13 @@
3+
@@ -106,9 +_,13 @@
44
new io.papermc.paper.event.connection.configuration.PlayerConnectionInitialConfigureEvent(this.paperConnection).callEvent(); // Paper
55
this.send(new ClientboundCustomPayloadPacket(new BrandPayload(this.server.getServerModName())));
66
ServerLinks serverLinks = this.server.serverLinks();

‎deepslateMC-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
22
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
3-
@@ -1562,7 +_,7 @@
3+
@@ -1564,7 +_,7 @@
44
io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
55
toX, toY, toZ, toYaw, toPitch, true);
66
if (!event.isAllowed()) {
77
- if (event.getLogWarning()) {
88
+ if (de.pascalpex.deepslatemc.files.Config.getMovedQuickly() && event.getLogWarning()) { // Deepslate
9-
LOGGER.warn("{} moved too quickly! {},{},{}", this.player.getName().getString(), d3, d4, d5);
9+
LOGGER.warn("{} moved too quickly! {},{},{}", this.player.getPlainTextName(), d3, d4, d5);
1010
}
1111
this.teleport(
12-
@@ -1640,7 +_,7 @@
12+
@@ -1642,7 +_,7 @@
1313
toX, toY, toZ, toYaw, toPitch, true);
1414
if (!event.isAllowed()) {
1515
movedWrongly = true;
1616
- if (event.getLogWarning())
1717
+ if (de.pascalpex.deepslatemc.files.Config.getMovedWrongly() && event.getLogWarning()) // Deepslate
1818
// Paper end
19-
LOGGER.warn("{} moved wrongly!, ({})", this.player.getName().getString(), verticalDelta); // Purpur - AFK API
19+
LOGGER.warn("{} moved wrongly!, ({})", this.player.getPlainTextName(), verticalDelta); // Purpur - AFK API
2020
} // Paper

‎deepslateMC-server/minecraft-patches/sources/net/minecraft/server/players/PlayerList.java.patch‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
--- a/net/minecraft/server/players/PlayerList.java
22
+++ b/net/minecraft/server/players/PlayerList.java
3-
@@ -462,6 +_,19 @@
4-
player.containerMenu.transferTo(player.containerMenu, bukkitPlayer);
3+
@@ -234,6 +_,19 @@
4+
player.containerMenu.transferTo(player.containerMenu, bukkitPlayer);
55

6-
org.bukkit.event.player.PlayerJoinEvent playerJoinEvent = new org.bukkit.event.player.PlayerJoinEvent(bukkitPlayer, getJoinMsg(mutableComponent, bukkitPlayer)); // Paper - Adventure // Leaf - Configurable connection message - join message
6+
org.bukkit.event.player.PlayerJoinEvent playerJoinEvent = new org.bukkit.event.player.PlayerJoinEvent(bukkitPlayer, getJoinMsg(mutableComponent, bukkitPlayer)); // Paper - Adventure // Leaf - Configurable connection message - join message
77
+
8-
+ de.pascalpex.deepslatemc.commands.SpawnCommand.playerJoin(bukkitPlayer); // Deepslate - Spawn functions
9-
+ // Deepslate start - Tablist
10-
+ if (de.pascalpex.deepslatemc.files.Config.getTablistEnabled()) {
11-
+ de.pascalpex.deepslatemc.util.TablistUtil.setTablist(bukkitPlayer);
12-
+ }
13-
+ // Deepslate end
14-
+ // Deepslate start - Bossbar
15-
+ if (de.pascalpex.deepslatemc.files.Config.getBossbarEnabled()) {
16-
+ de.pascalpex.deepslatemc.util.BossbarUtil.setBossbar(bukkitPlayer);
17-
+ }
18-
+ // Deepslate end
8+
+ de.pascalpex.deepslatemc.commands.SpawnCommand.playerJoin(bukkitPlayer); // Deepslate - Spawn functions
9+
+ // Deepslate start - Tablist
10+
+ if (de.pascalpex.deepslatemc.files.Config.getTablistEnabled()) {
11+
+ de.pascalpex.deepslatemc.util.TablistUtil.setTablist(bukkitPlayer);
12+
+ }
13+
+ // Deepslate end
14+
+ // Deepslate start - Bossbar
15+
+ if (de.pascalpex.deepslatemc.files.Config.getBossbarEnabled()) {
16+
+ de.pascalpex.deepslatemc.util.BossbarUtil.setBossbar(bukkitPlayer);
17+
+ }
18+
+ // Deepslate end
1919
+
20-
this.cserver.getPluginManager().callEvent(playerJoinEvent);
20+
this.cserver.getPluginManager().callEvent(playerJoinEvent);
2121

22-
if (!player.connection.isAcceptingMessages()) {
22+
if (!player.connection.isAcceptingMessages()) {

‎deepslateMC-server/minecraft-patches/sources/net/minecraft/world/level/chunk/storage/RegionFileStorage.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
22
+++ b/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
3-
@@ -308,7 +_,7 @@
3+
@@ -309,7 +_,7 @@
44

55
// Paper start
66
private static void printOversizedLog(String msg, Path file, int x, int z) {

0 commit comments

Comments
 (0)