Skip to content

Commit 8365b43

Browse files
committed
Complete 1.21.11 update
1 parent 57ecb5a commit 8365b43

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
uses: actions/[email protected]
2525
with:
2626
name: DeepslateMC
27-
path: deepslateMC-server/build/libs/deepslateMC-paperclip-1.21.11-rc1-R0.1-SNAPSHOT-mojmap.jar
27+
path: deepslateMC-server/build/libs/deepslateMC-paperclip-1.21.11-R0.1-SNAPSHOT-mojmap.jar

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
--- a/net/minecraft/server/MinecraftServer.java
22
+++ b/net/minecraft/server/MinecraftServer.java
3-
@@ -1295,6 +_,7 @@
3+
@@ -1296,6 +_,7 @@
44
org.spigotmc.WatchdogThread.tick();
55
// Paper end
66
org.spigotmc.WatchdogThread.hasStarted = true; // Paper
77
+ de.pascalpex.deepslatemc.files.Config.addSparkEntry(); // Deepslate - add deepslate.yml to spark
88
// Paper start - Add onboarding message for initial server start
99
if (io.papermc.paper.configuration.GlobalConfiguration.isFirstStart) {
1010
LOGGER.info("*************************************************************************************");
11-
@@ -1759,6 +_,19 @@
11+
@@ -1769,6 +_,19 @@
1212
private ServerStatus.Players buildPlayerStatus() {
1313
List<ServerPlayer> players = this.playerList.getPlayers();
1414
int maxPlayers = this.getMaxPlayers();
@@ -28,7 +28,7 @@
2828
if (this.hidesOnlinePlayers()) {
2929
return new ServerStatus.Players(maxPlayers, players.size(), List.of());
3030
} else {
31-
@@ -2140,7 +_,18 @@
31+
@@ -2150,7 +_,18 @@
3232

3333
public void setMotd(String motd) {
3434
// Paper start - Adventure

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.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/dedicated/DedicatedServer.java
22
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
3-
@@ -272,6 +_,8 @@
3+
@@ -281,6 +_,8 @@
44
org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash); // Paper - start watchdog thread
55
thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
66
io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command

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-
@@ -1589,7 +_,7 @@
3+
@@ -1582,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.getPlainTextName(), d3, d4, d5);
1010
}
1111
this.teleport(
12-
@@ -1668,7 +_,7 @@
12+
@@ -1661,7 +_,7 @@
1313
toX, toY, toZ, toYaw, toPitch, true);
1414
if (!event.isAllowed()) {
1515
movedWrongly = true;

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
group=de.pascalpex.deepslatemc
2-
version=1.21.11-rc1-R0.1-SNAPSHOT
3-
mcVersion=1.21.11-rc1
2+
version=1.21.11-R0.1-SNAPSHOT
3+
mcVersion=1.21.11
44
apiVersion=1.21.11
5-
purpurRef=4385807b7e9c9f5ed8b2442f94b2356351528b67
5+
purpurRef=068b0d5a9e8b9946c2a5d98a51b03df7b08a41f4
66

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

0 commit comments

Comments
 (0)