Skip to content

Commit 21d1ed3

Browse files
committed
Updated Upstream (Leaf)
1 parent 6843886 commit 21d1ed3

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ 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 2a6669754868662b7252de6056e2177b76c80e45..a14890376fce2557bcf8a91d49741d5fb38918bf 100644
33+
index 4b43231c9ca77129606bf99c066e5f3beda29d8f..7d4aeb1c0baec05ba17c53ce9a1a0e0b580418c7 100644
3434
--- a/net/minecraft/server/players/PlayerList.java
3535
+++ b/net/minecraft/server/players/PlayerList.java
36-
@@ -489,6 +489,25 @@ public abstract class PlayerList {
36+
@@ -490,6 +490,25 @@ public abstract class PlayerList {
3737
// CraftBukkit start - sendAll above replaced with this loop
3838
ClientboundPlayerInfoUpdatePacket packet = ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player)); // Paper - Add Listing API for Player
3939

@@ -59,7 +59,7 @@ index 2a6669754868662b7252de6056e2177b76c80e45..a14890376fce2557bcf8a91d49741d5f
5959
final List<ServerPlayer> onlinePlayers = Lists.newArrayListWithExpectedSize(this.players.size() - 1); // Paper - Use single player info update packet on join
6060
for (int i = 0; i < this.players.size(); ++i) {
6161
ServerPlayer entityplayer1 = (ServerPlayer) this.players.get(i);
62-
@@ -497,7 +516,13 @@ public abstract class PlayerList {
62+
@@ -498,7 +517,13 @@ public abstract class PlayerList {
6363
// Paper start - Add Listing API for Player
6464
if (entityplayer1.getBukkitEntity().isListed(bukkitPlayer)) {
6565
// Paper end - Add Listing API for Player
@@ -74,7 +74,7 @@ index 2a6669754868662b7252de6056e2177b76c80e45..a14890376fce2557bcf8a91d49741d5f
7474
// Paper start - Add Listing API for Player
7575
} else {
7676
entityplayer1.connection.send(ClientboundPlayerInfoUpdatePacket.createSinglePlayerInitializing(player, false));
77-
@@ -519,7 +544,27 @@ public abstract class PlayerList {
77+
@@ -520,7 +545,27 @@ public abstract class PlayerList {
7878
}
7979
// Paper start - Use single player info update packet on join
8080
if (!onlinePlayers.isEmpty()) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
this.cserver.getPluginManager().callEvent(playerJoinEvent);
2121

2222
if (!player.connection.isAcceptingMessages()) {
23-
@@ -856,6 +_,15 @@
23+
@@ -857,6 +_,15 @@
2424
}
2525
}
2626
this.cserver.getPluginManager().callEvent(event);

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.5-R0.1-SNAPSHOT
33
mcVersion=1.21.5
4-
leafRef=bc33d3089ae32c177ac4dc644f8cd193b5706188
4+
leafRef=0e1ff0ecd26acc6d18f9cee15a7e13164c9ca7e2
55

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

0 commit comments

Comments
 (0)