Skip to content

Commit ba70c01

Browse files
committed
Updated Upstream (Leaf)
1 parent 3504d8a commit ba70c01

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

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-
@@ -1206,6 +_,7 @@
3+
@@ -1207,6 +_,7 @@
44
// Paper end
55
org.spigotmc.WatchdogThread.hasStarted = true; // Paper
66
org.dreeam.leaf.config.LeafConfig.regSparkExtraConfig(); // Leaf - Leaf config
77
+ de.pascalpex.deepslatemc.files.Config.addSparkEntry(); // Deepslate - add deepslate.yml to spark
88
Arrays.fill(this.recentTps, 20);
99
// Paper start - further improve server tick loop
1010
long tickSection = Util.getNanos();
11-
@@ -1664,6 +_,19 @@
11+
@@ -1665,6 +_,19 @@
1212
private ServerStatus.Players buildPlayerStatus() {
1313
List<ServerPlayer> players = this.playerList.realPlayers; // Leaves - only real player
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-
@@ -2098,7 +_,18 @@
31+
@@ -2099,7 +_,18 @@
3232

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

deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/files/ConfigEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ enum ConfigEntry {
1919
KNOWLEDGE_BOOK_CLICK("preventKnowledgebookClick", false),
2020
MOVED_WRONGLY_MESSAGES("messages" + ".movedWrongly", true),
2121
MOVED_QUICKLY_MESSAGES("messages" + ".movedQuickly", true),
22-
F3_NAME("f3name", "&eDeepslateMC"),
22+
F3_NAME("f3name", "&b&lDeepslateMC"),
2323
TABLIST_ENABLED("tablist" + ".enabled", false),
2424
TABLIST_HEADER("tablist" + ".header", List.of("&4This is the", "&4default header")),
2525
TABLIST_FOOTER("tablist" + ".footer", List.of("&6This is the", "&6default footer")),

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=88699fb548db9d3832694463be1e4859a3bea28a
4+
leafRef=693384826a9c328ce08a4db99a6b068e0030c8b5
55

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

0 commit comments

Comments
 (0)