Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-06 15:41:56 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Martijn Muijsers
2023-09-22 21:04:38 +02:00
parent 34f9f1abdb
commit 3e68a8125c
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -8,7 +8,7 @@ plugins {
java
`maven-publish`
id("com.github.johnrengelman.shadow") version "8.1.1" apply false
id("io.papermc.paperweight.patcher") version "1.5.5"
id("io.papermc.paperweight.patcher") version "1.5.5--SNAPSHOT"
}
allprojects {

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=org.galemc.gale
version=1.20.1-R0.1-SNAPSHOT
mcVersion=1.20.1
paperRef=3fd1502717e753405a74fbad4a16d2fd7a14187b
paperRef=773dd724469bae89d0c2075edc3d1ddc8d5b0b18
org.gradle.caching=true
org.gradle.parallel=true

4
patches/server/0008-Gale-semantic-version.patch
View File

@@ -29,7 +29,7 @@ index 2868dab7b100d9c325b0e5056f86660d631dec4b..2acad4c3fd58178b0f8b22bdb04eeeeb
}
diff --git a/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java
new file mode 100644
index 0000000000000000000000000000000000000000..36d8caeb8b2f772389c86c2242d09621ec07c7f4
index 0000000000000000000000000000000000000000..3665747cbb64b2ac5ec0a5a90ebc7ede40ac64e6
--- /dev/null
+++ b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java
@@ -0,0 +1,37 @@
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..36d8caeb8b2f772389c86c2242d09621
+ * The <code>patch</code> version is incremented for small changes that do not affect the goal of any feature,
+ * such as bug fixes, performance improvements or changes in wording.
+ */
+ public static final @NotNull String version = "0.6.11";
+ public static final @NotNull String version = "0.6.12";
+
+ /**
+ * The "<code>major.minor</code>" portion of the {@link #version}.

6
patches/server/0009-Gale-configuration.patch
View File

@@ -457,10 +457,10 @@ index 7d54c79f46f99f5500e9cb1f486037cafb27ee3a..76180ed9a5ff711e570f78d89f2d4272
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a566fd576c0b82a6fd3ea8182d08bdd23370fed0..93a4415ee80a01eb494c8c86d2d94b2bdf1da9a8 100644
index e70d0248130f89410e39699a0943ae692f7f8d4e..1ea254545d0c15d549f7cb537ca14c7ff23eddb6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1035,6 +1035,7 @@ public final class CraftServer implements Server {
@@ -1037,6 +1037,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
@@ -468,7 +468,7 @@ index a566fd576c0b82a6fd3ea8182d08bdd23370fed0..93a4415ee80a01eb494c8c86d2d94b2b
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -2910,6 +2911,14 @@ public final class CraftServer implements Server {
@@ -2912,6 +2913,14 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}

4
patches/server/0030-Print-stack-trace-for-plugins-not-shutting-down-task.patch
View File

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 93a4415ee80a01eb494c8c86d2d94b2bdf1da9a8..4af3c47e8f93220a1740242b21aee96ed1902e0d 100644
index 1ea254545d0c15d549f7cb537ca14c7ff23eddb6..9af0ab1858421cd96512f717e4b637dbef963f78 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1119,6 +1119,13 @@ public final class CraftServer implements Server {
@@ -1121,6 +1121,13 @@ public final class CraftServer implements Server {
plugin.getPluginMeta().getDisplayName(),
"This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
));

8
patches/server/0127-CraftBukkit-UUID-to-world-map.patch
View File

@@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4af3c47e8f93220a1740242b21aee96ed1902e0d..7b62a82ecc6fa51ed38bb92f9d00bff66726f3d3 100644
index 9af0ab1858421cd96512f717e4b637dbef963f78..5e5ef4219a0a6970b8775fe2425be2099f4c1fbf 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -44,6 +44,9 @@ import java.util.logging.Level;
@@ -34,7 +34,7 @@ index 4af3c47e8f93220a1740242b21aee96ed1902e0d..7b62a82ecc6fa51ed38bb92f9d00bff6
private final Map<Class<?>, Registry<?>> registries = new HashMap<>();
private YamlConfiguration configuration;
private YamlConfiguration commandsConfiguration;
@@ -1408,6 +1412,7 @@ public final class CraftServer implements Server {
@@ -1410,6 +1414,7 @@ public final class CraftServer implements Server {
this.getLogger().log(Level.SEVERE, null, ex);
}
@@ -42,7 +42,7 @@ index 4af3c47e8f93220a1740242b21aee96ed1902e0d..7b62a82ecc6fa51ed38bb92f9d00bff6
this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
this.console.removeLevel(handle);
return true;
@@ -1426,12 +1431,7 @@ public final class CraftServer implements Server {
@@ -1428,12 +1433,7 @@ public final class CraftServer implements Server {
@Override
public World getWorld(UUID uid) {
@@ -56,7 +56,7 @@ index 4af3c47e8f93220a1740242b21aee96ed1902e0d..7b62a82ecc6fa51ed38bb92f9d00bff6
}
// Paper start
@@ -1449,6 +1449,7 @@ public final class CraftServer implements Server {
@@ -1451,6 +1451,7 @@ public final class CraftServer implements Server {
System.out.println("World " + world.getName() + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + world.getName() + "'s world directory if you want to be able to load the duplicate world.");
return;
}

4
patches/server/0129-Specific-interval-TPS-API.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7b62a82ecc6fa51ed38bb92f9d00bff66726f3d3..ea4e524f792f1cabfa11db6543e4ae2f39734913 100644
index 5e5ef4219a0a6970b8775fe2425be2099f4c1fbf..42d74cdbca55fba1d00c14197604e22ddeeed7ed 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2879,6 +2879,25 @@ public final class CraftServer implements Server {
@@ -2881,6 +2881,25 @@ public final class CraftServer implements Server {
};
}

4
patches/server/0130-5-second-TPS-average.patch
View File

@@ -79,10 +79,10 @@ index 203598a379f944f44ff38bdd2007387cc7bc3176..350d503d7f03c63c0e3e2155a75035b9
tps5.add(currentTps, diff);
tps15.add(currentTps, diff);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ea4e524f792f1cabfa11db6543e4ae2f39734913..87e020d6eecd1f564f24f164d7338b5f21bfa197 100644
index 42d74cdbca55fba1d00c14197604e22ddeeed7ed..052d5d7c152555d9ff9d8f5a1b0d2e93a889a723 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2879,8 +2879,27 @@ public final class CraftServer implements Server {
@@ -2881,8 +2881,27 @@ public final class CraftServer implements Server {
};
}

4
patches/server/0132-Last-tick-time-API.patch
View File

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 87e020d6eecd1f564f24f164d7338b5f21bfa197..36df1adcc2adc40ef04100564650b463f3c64bf6 100644
index 052d5d7c152555d9ff9d8f5a1b0d2e93a889a723..e332b34cfbc1c15b14141a6ddd070656805dd06c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3178,4 +3178,22 @@ public final class CraftServer implements Server {
@@ -3180,4 +3180,22 @@ public final class CraftServer implements Server {
}
// Paper end