Skip to content

Commit f19e8ae

Browse files
PascalpexPascalpex
committed
Finish 1.21.7 update
1 parent 8b3f4f4 commit f19e8ae

File tree

7 files changed

+61
-35
lines changed

7 files changed

+61
-35
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 4c42f4cb5e5ea21b28824467fae54255ffa868c9..a2757f5458243ce608a1c982bde5e5eb738d00f2 100644
33+
index daf2410db29adad3751da1b08fa1774d84190aff..2cdbfbf0955658ef5ca23bce085d7638c6006aee 100644
3434
--- a/net/minecraft/server/players/PlayerList.java
3535
+++ b/net/minecraft/server/players/PlayerList.java
36-
@@ -491,6 +491,25 @@ public abstract class PlayerList {
36+
@@ -478,6 +478,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 4c42f4cb5e5ea21b28824467fae54255ffa868c9..a2757f5458243ce608a1c982bde5e5eb
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-
@@ -499,7 +518,13 @@ public abstract class PlayerList {
62+
@@ -486,7 +505,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 4c42f4cb5e5ea21b28824467fae54255ffa868c9..a2757f5458243ce608a1c982bde5e5eb
7474
// Paper start - Add Listing API for Player
7575
} else {
7676
entityplayer1.connection.send(ClientboundPlayerInfoUpdatePacket.createSinglePlayerInitializing(player, false));
77-
@@ -521,7 +546,27 @@ public abstract class PlayerList {
77+
@@ -508,7 +533,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/network/ServerConfigurationPacketListenerImpl.java.patch‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
--- a/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
22
+++ b/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
3-
@@ -83,6 +_,10 @@
4-
// CraftBukkit start
5-
org.bukkit.craftbukkit.CraftServerLinks wrapper = new org.bukkit.craftbukkit.CraftServerLinks(serverLinks);
6-
org.bukkit.event.player.PlayerLinksSendEvent event = new org.bukkit.event.player.PlayerLinksSendEvent(this.player.getBukkitEntity(), wrapper);
7-
+ // Deepslate start - server links
8-
+ java.util.Map<net.kyori.adventure.text.Component, java.net.URI> deepslateLinks = de.pascalpex.deepslatemc.util.ServerLinkUtil.getLinks();
9-
+ deepslateLinks.keySet().forEach(key -> wrapper.addLink(key, deepslateLinks.get(key)));
10-
+ // Deepslate end - server links
11-
this.cserver.getPluginManager().callEvent(event);
12-
serverLinks = wrapper.getServerLinks();
13-
// CraftBukkit end
3+
@@ -81,9 +_,13 @@
4+
new io.papermc.paper.event.connection.configuration.PlayerConnectionInitialConfigureEvent(this.paperConnection).callEvent(); // Paper
5+
this.send(new ClientboundCustomPayloadPacket(new BrandPayload(this.server.getServerModName())));
6+
ServerLinks serverLinks = this.server.serverLinks();
7+
- if (!serverLinks.isEmpty()) {
8+
+ if (!serverLinks.isEmpty() || !de.pascalpex.deepslatemc.util.ServerLinkUtil.getLinks().isEmpty()) { // Deepslate - server links
9+
// Paper start
10+
org.bukkit.craftbukkit.CraftServerLinks links = new org.bukkit.craftbukkit.CraftServerLinks(serverLinks);
11+
+ // Deepslate start - server links
12+
+ java.util.Map<net.kyori.adventure.text.Component, java.net.URI> deepslateLinks = de.pascalpex.deepslatemc.util.ServerLinkUtil.getLinks();
13+
+ deepslateLinks.keySet().forEach(key -> links.addLink(key, deepslateLinks.get(key)));
14+
+ // Deepslate end - server links
15+
new org.bukkit.event.player.PlayerLinksSendEvent(this.paperConnection, links).callEvent();
16+
this.send(new ClientboundServerLinksPacket(links.getServerLinks().untrust()));
17+
// Paper end

‎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-
@@ -1550,7 +_,7 @@
3+
@@ -1552,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-
@@ -1628,7 +_,7 @@
12+
@@ -1630,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: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,3 @@
2020
this.cserver.getPluginManager().callEvent(playerJoinEvent);
2121

2222
if (!player.connection.isAcceptingMessages()) {
23-
@@ -860,6 +_,15 @@
24-
}
25-
}
26-
this.cserver.getPluginManager().callEvent(event);
27-
+ // Deepslate start - Maintenance mode
28-
+ if(de.pascalpex.deepslatemc.files.Config.getMaintenanceMode()) {
29-
+ if(!player.hasPermission("deepslate.maintenancebypass")) {
30-
+ net.kyori.adventure.text.Component prefix = de.pascalpex.deepslatemc.files.MessagesFile.getMessage(de.pascalpex.deepslatemc.files.MessagesEntry.PREFIX);
31-
+ net.kyori.adventure.text.Component kickMessage = de.pascalpex.deepslatemc.files.MessagesFile.getMessage(de.pascalpex.deepslatemc.files.MessagesEntry.MAINTENANCE_KICK);
32-
+ event.disallow(org.bukkit.event.player.PlayerLoginEvent.Result.KICK_OTHER, prefix.appendSpace().append(kickMessage));
33-
+ }
34-
+ }
35-
+ // Deepslate end
36-
if (event.getResult() != org.bukkit.event.player.PlayerLoginEvent.Result.ALLOWED) {
37-
loginlistener.disconnect(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.kickMessage())); // Paper - Adventure
38-
return null;

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
--- a/src/main/java/io/papermc/paper/connection/HorriblePlayerLoginEventHack.java
2+
+++ b/src/main/java/io/papermc/paper/connection/HorriblePlayerLoginEventHack.java
3+
@@ -43,12 +_,17 @@
4+
}
5+
6+
public static @Nullable Component execute(final Connection connection, MinecraftServer server, GameProfile profile, PlayerList.LoginResult result) {
7+
- if (PlayerLoginEvent.getHandlerList().getRegisteredListeners().length == 0) {
8+
+ if (PlayerLoginEvent.getHandlerList().getRegisteredListeners().length == 0 && !de.pascalpex.deepslatemc.files.Config.getMaintenanceMode()) { // Deepslate - maintenance mode
9+
return result.message();
10+
}
11+
12+
if (!nagged) {
13+
Set<String> plugins = new HashSet<>();
14+
+ // Deepslate start - Maintenance mode
15+
+ if(de.pascalpex.deepslatemc.files.Config.getMaintenanceMode()) {
16+
+ plugins.add("DeepslateMC"); // TODO: Find better solution
17+
+ }
18+
+ // Deepslate end
19+
for (final RegisteredListener listener : PlayerLoginEvent.getHandlerList().getRegisteredListeners()) {
20+
plugins.add(listener.getPlugin().getName());
21+
}
22+
@@ -81,6 +_,16 @@
23+
PlayerLoginEvent event = new PlayerLoginEvent(horribleBukkitPlayer, connection.hostname, ((java.net.InetSocketAddress) connection.getRemoteAddress()).getAddress(), ((java.net.InetSocketAddress) connection.channel.remoteAddress()).getAddress());
24+
event.disallow(result.result(), PaperAdventure.asAdventure(result.message()));
25+
event.callEvent();
26+
+
27+
+ // Deepslate start - Maintenance mode
28+
+ if(de.pascalpex.deepslatemc.files.Config.getMaintenanceMode()) {
29+
+ if(!horribleBukkitPlayer.hasPermission("deepslate.maintenancebypass")) {
30+
+ net.kyori.adventure.text.Component prefix = de.pascalpex.deepslatemc.files.MessagesFile.getMessage(de.pascalpex.deepslatemc.files.MessagesEntry.PREFIX);
31+
+ net.kyori.adventure.text.Component kickMessage = de.pascalpex.deepslatemc.files.MessagesFile.getMessage(de.pascalpex.deepslatemc.files.MessagesEntry.MAINTENANCE_KICK);
32+
+ event.disallow(org.bukkit.event.player.PlayerLoginEvent.Result.KICK_OTHER, prefix.appendSpace().append(kickMessage));
33+
+ }
34+
+ }
35+
+ // Deepslate end
36+
37+
Component finalResult;
38+
if (event.getResult() == PlayerLoginEvent.Result.ALLOWED) {

‎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-
@@ -513,6 +_,17 @@
3+
@@ -523,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.7-R0.1-SNAPSHOT
33
mcVersion=1.21.7
4-
leafRef=whereIsLeafItIsProbablyAbandoned
4+
leafRef=0912dd341ca200f1b1f1da20f6271d0d834299b0
55

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

0 commit comments

Comments
 (0)