Skip to content

Commit 483a6eb

Browse files
PascalpexPascalpex
committed
Apply all patches
1 parent 86dbb56 commit 483a6eb

File tree

10 files changed

+103
-103
lines changed

10 files changed

+103
-103
lines changed

‎deepslateMC-server/build.gradle.kts.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/leaf-server/build.gradle.kts
22
+++ b/leaf-server/build.gradle.kts
3-
@@ -43,7 +_,30 @@
3+
@@ -35,7 +_,30 @@
44
}
55
}
66

@@ -32,7 +32,7 @@
3232
// Leaf end - project setup
3333

3434
spigot {
35-
@@ -133,10 +_,14 @@
35+
@@ -125,10 +_,14 @@
3636
main {
3737
java { srcDir("../paper-server/src/main/java") }
3838
resources { srcDir("../paper-server/src/main/resources") }
@@ -47,7 +47,7 @@
4747
}
4848
}
4949

50-
@@ -165,7 +_,7 @@
50+
@@ -157,7 +_,7 @@
5151
}
5252

5353
dependencies {
@@ -56,7 +56,7 @@
5656

5757
// Leaf start - Libraries
5858
implementation("com.github.thatsmusic99:ConfigurationMaster-API:v2.0.0-rc.3") { // Leaf config
59-
@@ -280,14 +_,14 @@
59+
@@ -272,14 +_,14 @@
6060
val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
6161
attributes(
6262
"Main-Class" to "org.bukkit.craftbukkit.Main",

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

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ 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 f7a05fd098ef7b303254cd410414d50d68225395..3d34861ef5611bd304a30608c69341b998e91bd1 100644
8+
index be5da5a81246b4f4abe19f7c0cf68990d6bdf5bd..38661e8aa55a795cb3fdd4f08e3251ca8a309b2b 100644
99
--- a/net/minecraft/server/level/ServerPlayerGameMode.java
1010
+++ b/net/minecraft/server/level/ServerPlayerGameMode.java
1111
@@ -75,10 +75,16 @@ public class ServerPlayerGameMode {
1212
// CraftBukkit end
1313
this.setGameModeForPlayer(gameModeForPlayer, this.gameModeForPlayer); // Paper - Fix MC-259571
1414
this.player.onUpdateAbilities();
15-
- this.player
16-
- .server
15+
- this.level
16+
- .getServer()
1717
- .getPlayerList()
1818
- .broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit
1919
+ // Deepslate start - Don't send spectator mode packets to other players
2020
+ if(de.pascalpex.deepslatemc.files.Config.getSendSpectatorModePackets() || gameModeForPlayer != GameType.SPECTATOR) {
21-
+ this.player
22-
+ .server
21+
+ this.level
22+
+ .getServer()
2323
+ .getPlayerList()
2424
+ .broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit
2525
+ } else {
@@ -30,76 +30,76 @@ index f7a05fd098ef7b303254cd410414d50d68225395..3d34861ef5611bd304a30608c69341b9
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 4b43231c9ca77129606bf99c066e5f3beda29d8f..7d4aeb1c0baec05ba17c53ce9a1a0e0b580418c7 100644
33+
index 4c42f4cb5e5ea21b28824467fae54255ffa868c9..a2757f5458243ce608a1c982bde5e5eb738d00f2 100644
3434
--- a/net/minecraft/server/players/PlayerList.java
3535
+++ b/net/minecraft/server/players/PlayerList.java
36-
@@ -490,6 +490,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+
@@ -491,6 +491,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());
54-
+
55-
+ modifiedPacket = new ClientboundPlayerInfoUpdatePacket(packet.actions(), List.of(entryWithoutSpectator));
56-
+ }
57-
+ // Deepslate end - Don't send spectator mode packets to other players
58-
+
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-
@@ -498,7 +517,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
8240
+ // Deepslate start - Don't send spectator mode packets to other players
83-
+ ClientboundPlayerInfoUpdatePacket updatePacket = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(onlinePlayers, player);
41+
+ ClientboundPlayerInfoUpdatePacket modifiedPacket = null;
8442
+ 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);
98-
+ }
99-
+ updatePacket = new ClientboundPlayerInfoUpdatePacket(updatePacket.actions(), newEntries);
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());
54+
+
55+
+ modifiedPacket = new ClientboundPlayerInfoUpdatePacket(packet.actions(), List.of(entryWithoutSpectator));
10056
+ }
101-
+ player.connection.send(updatePacket); // Paper - Add Listing API for Player
10257
+ // 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;
58+
+
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+
@@ -499,7 +518,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+
@@ -521,7 +546,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);
98+
+ }
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-
@@ -153,6 +_,10 @@
3+
@@ -179,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-
@@ -175,7 +_,7 @@
14+
@@ -202,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-
@@ -236,7 +_,9 @@
23+
@@ -265,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-
@@ -68,6 +_,17 @@
3+
@@ -69,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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/server/MinecraftServer.java
22
+++ b/net/minecraft/server/MinecraftServer.java
3-
@@ -1664,6 +_,19 @@
3+
@@ -1665,6 +_,19 @@
44
private ServerStatus.Players buildPlayerStatus() {
55
List<ServerPlayer> players = this.playerList.realPlayers; // Leaves - only real player
66
int maxPlayers = this.getMaxPlayers();
@@ -20,7 +20,7 @@
2020
if (this.hidesOnlinePlayers()) {
2121
return new ServerStatus.Players(maxPlayers, players.size(), List.of());
2222
} else {
23-
@@ -2098,7 +_,18 @@
23+
@@ -2099,7 +_,18 @@
2424

2525
public void setMotd(String motd) {
2626
// Paper start - Adventure

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
22
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
3-
@@ -1516,7 +_,7 @@
3+
@@ -1550,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()) {
@@ -9,7 +9,7 @@
99
LOGGER.warn("{} moved too quickly! {},{},{}", this.player.getName().getString(), d3, d4, d5);
1010
}
1111
this.teleport(
12-
@@ -1594,7 +_,7 @@
12+
@@ -1628,7 +_,7 @@
1313
toX, toY, toZ, toYaw, toPitch, true);
1414
if (!event.isAllowed()) {
1515
movedWrongly = true;

‎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,26 +1,26 @@
11
--- a/net/minecraft/server/players/PlayerList.java
22
+++ b/net/minecraft/server/players/PlayerList.java
3-
@@ -455,6 +_,19 @@
4-
player.containerMenu.transferTo(player.containerMenu, bukkitPlayer);
3+
@@ -456,6 +_,19 @@
4+
player.containerMenu.transferTo(player.containerMenu, bukkitPlayer);
55

66
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()) {
23-
@@ -857,6 +_,15 @@
22+
if (!player.connection.isAcceptingMessages()) {
23+
@@ -860,6 +_,15 @@
2424
}
2525
}
2626
this.cserver.getPluginManager().callEvent(event);

‎deepslateMC-server/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME)
1818
- .orElse(BRAND_LEAF_NAME), // Gale - branding changes // Leaf - Rebrand
1919
+ .orElse(BRAND_DEEPSLATE_NAME), // Gale - branding changes // Leaf - Rebrand // Deepslate
20-
SharedConstants.getCurrentVersion().getId(),
21-
SharedConstants.getCurrentVersion().getName(),
20+
SharedConstants.getCurrentVersion().id(),
21+
SharedConstants.getCurrentVersion().name(),
2222
getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)
2323
@@ -72,7 +_,8 @@
2424
|| brandId.equals(BRAND_PAPER_ID)

‎deepslateMC-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
22
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
3-
@@ -512,6 +_,17 @@
3+
@@ -513,6 +_,17 @@
44
if (cancelledItem) {
55
event.setUseItemInHand(Result.DENY);
66
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
group=de.pascalpex.deepslatemc
22
version=1.21.6-R0.1-SNAPSHOT
33
mcVersion=1.21.6-rc1
4-
leafRef=6d58834bca80abc6ee121f344c528656116d707b
4+
leafRef=4180f041c17d7983aec58f906a8720380d4a4bab
55

66
org.gradle.configuration-cache=true
77
org.gradle.caching=true

0 commit comments

Comments
 (0)