Skip to content

Commit 90397d2

Browse files
committed
Updated Upstream (Leaf)
1 parent c260e12 commit 90397d2

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ jobs:
44
build:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v5.0.1
7+
- uses: actions/checkout@v6.0.1
88
- name: Set up JDK 21
9-
uses: actions/setup-java@v5.0.0
9+
uses: actions/setup-java@v5.1.0
1010
with:
1111
java-version: 21.0.9
1212
distribution: 'temurin'

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 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 527990be76068bf58fbb2e6e3901f64ed266f474..b0c14cac56b8717831348a38ba9ff73260689d4e 100644
33+
index dc4816f1c4ea72d5c12dabd1ab8dcfd2e7fa5af1..f49ce8b9032250927822344b33467e3b5faf4e3f 100644
3434
--- a/net/minecraft/server/players/PlayerList.java
3535
+++ b/net/minecraft/server/players/PlayerList.java
36-
@@ -495,6 +495,25 @@ public abstract class PlayerList {
36+
@@ -496,6 +496,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 527990be76068bf58fbb2e6e3901f64ed266f474..b0c14cac56b8717831348a38ba9ff732
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-
@@ -503,7 +522,13 @@ public abstract class PlayerList {
62+
@@ -504,7 +523,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 527990be76068bf58fbb2e6e3901f64ed266f474..b0c14cac56b8717831348a38ba9ff732
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
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/server/players/PlayerList.java
22
+++ b/net/minecraft/server/players/PlayerList.java
3-
@@ -461,6 +_,19 @@
3+
@@ -462,6 +_,19 @@
44
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

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.8-R0.1-SNAPSHOT
33
mcVersion=1.21.8
4-
leafRef=07204f7d98bb2d683c7a4da326ee03530b4c449b
4+
leafRef=4c79df5b94e3371a4d4989a684527369c3e3d1b7
55

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

0 commit comments

Comments
 (0)