Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2026-01-04 15:31:43 +00:00
Code Issues Releases Activity

update upstream

Browse Source
This commit is contained in:
NONPLAYT
2023-03-05 14:12:39 +03:00
parent 578b6683c8
commit 981c713b95
5 changed files with 9 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0001-Divine-Branding.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Divine Branding
diff --git a/build.gradle.kts b/build.gradle.kts
index d177ad2221c330488c3c9da59b454794f3f2a9c0..d913d58c428e8df1ce4921dbeb8a2384f9fa0d2d 100644
index 77d057333f2e7755a230eec1cfddac11e98f8c2f..c6085109028e8e458e800055fdc0a8fbfa7ed221 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
@@ -196,7 +196,7 @@ index 0000000000000000000000000000000000000000..0dc13e363448d7a0f20993e0576af625
+ }
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 68d16efaf9c2d997afabadcf1ee24c5de685b5b3..0fd92d123fd5e068a5304204e86fbdcbcbb150f6 100644
index 33a5e900c2cab99c311fa5f5b71a609cf8f802cb..0b414bcb1799d895d8d1b7dce42d7d5bee265ec8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1656,7 +1656,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -209,7 +209,7 @@ index 68d16efaf9c2d997afabadcf1ee24c5de685b5b3..0fd92d123fd5e068a5304204e86fbdcb
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5077c545e74711d5268d3cfa31926af1e995ea05..54b85b17df42ab06b1c8d6507b3a4a259eccda34 100644
index 7ddf52de4b095f63c75b696008fcdde6345fc3c8..cfb665cf895cd96d1b6f78267abfd2c1ac113312 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
@@ -235,10 +235,10 @@ index 190e17eb28d166aedee06e9578561ba402d1b6d2..8f3577c35a1610772d2050534e5c201d
//Thread.sleep(TimeUnit.SECONDS.toMillis(20));
// Paper End
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index b9e4305f515faa14c2afc0ccaf23d205e9c9f858..b71f9ac31941204f4f5e1aed9fec44f7a719e5a0 100644
index 6aa2121e286dd6d43201a38722ea0cdd205baaa7..98794b2413111b7e6cb7900c1f91b494b60ddaed 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -462,7 +462,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -468,7 +468,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

6
patches/server/0007-Add-last-tick-time-API.patch
View File

@@ -7,7 +7,7 @@ Original code by YatopiaMC, licensed under MIT
You can find the original code on https://github.com/YatopiaMC/Yatopia
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0fd92d123fd5e068a5304204e86fbdcbcbb150f6..60ce593f25bdd90d53407c1281f580ef5429c9ee 100644
index 0b414bcb1799d895d8d1b7dce42d7d5bee265ec8..3a378940093d2990b95a2097973fafe38589d4e9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1096,6 +1096,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -29,10 +29,10 @@ index 0fd92d123fd5e068a5304204e86fbdcbcbb150f6..60ce593f25bdd90d53407c1281f580ef
this.mayHaveDelayedTasks = true;
this.delayedTasksMaxNextTickTime = Math.max(Util.getMillis() + 50L, this.nextTickTime);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 54b85b17df42ab06b1c8d6507b3a4a259eccda34..ee2c7a73af0a64916f05ff9461c3e6fc30108f16 100644
index cfb665cf895cd96d1b6f78267abfd2c1ac113312..ffde3c96f0593ca9719a3e1fb24ee5839b57f6db 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2943,6 +2943,12 @@ public final class CraftServer implements Server {
@@ -2924,6 +2924,12 @@ public final class CraftServer implements Server {
public CraftPotionBrewer getPotionBrewer() {
return this.potionBrewer;
}