Skip to content

Commit d032ca8

Browse files
committed
Updated Upstream (Leaf)
1 parent f19e8ae commit d032ca8

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 be5da5a81246b4f4abe19f7c0cf68990d6bdf5bd..38661e8aa55a795cb3fdd4f08e3251ca
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 daf2410db29adad3751da1b08fa1774d84190aff..2cdbfbf0955658ef5ca23bce085d7638c6006aee 100644
33+
index 2660024229cccdd931a8ed34dec0ddd127fafb59..917d076964c6c8b7efa9c20f07e846bdafe85f9a 100644
3434
--- a/net/minecraft/server/players/PlayerList.java
3535
+++ b/net/minecraft/server/players/PlayerList.java
36-
@@ -478,6 +478,25 @@ public abstract class PlayerList {
36+
@@ -491,6 +491,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 daf2410db29adad3751da1b08fa1774d84190aff..2cdbfbf0955658ef5ca23bce085d7638
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-
@@ -486,7 +505,13 @@ public abstract class PlayerList {
62+
@@ -499,7 +518,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 daf2410db29adad3751da1b08fa1774d84190aff..2cdbfbf0955658ef5ca23bce085d7638
7474
// Paper start - Add Listing API for Player
7575
} else {
7676
entityplayer1.connection.send(ClientboundPlayerInfoUpdatePacket.createSinglePlayerInitializing(player, false));
77-
@@ -508,7 +533,27 @@ public abstract class PlayerList {
77+
@@ -521,7 +546,27 @@ public abstract class PlayerList {
7878
}
7979
// Paper start - Use single player info update packet on join
8080
if (!onlinePlayers.isEmpty()) {

deepslateMC-server/paper-patches/files/src/main/java/io/papermc/paper/connection/HorriblePlayerLoginEventHack.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
for (final RegisteredListener listener : PlayerLoginEvent.getHandlerList().getRegisteredListeners()) {
2020
plugins.add(listener.getPlugin().getName());
2121
}
22-
@@ -81,6 +_,16 @@
22+
@@ -83,6 +_,16 @@
2323
PlayerLoginEvent event = new PlayerLoginEvent(horribleBukkitPlayer, connection.hostname, ((java.net.InetSocketAddress) connection.getRemoteAddress()).getAddress(), ((java.net.InetSocketAddress) connection.channel.remoteAddress()).getAddress());
2424
event.disallow(result.result(), PaperAdventure.asAdventure(result.message()));
2525
event.callEvent();

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.7-R0.1-SNAPSHOT
33
mcVersion=1.21.7
4-
leafRef=0912dd341ca200f1b1f1da20f6271d0d834299b0
4+
leafRef=437e63e61c76a24b9ec054b7f835e9bdd887a734
55

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

0 commit comments

Comments
 (0)