Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-19 14:59:29 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@76753219 Allow Server#getDefaultGameMode before worlds are initialized (#12491)
This commit is contained in:
Dreeam
2025-04-30 16:09:49 -04:00
parent f57773d224
commit d5d63524e0
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gale-server/paper-patches/features/0004-Gale-configuration.patch
View File

@@ -144,10 +144,10 @@ index 05339a176083af667c16f77d76dc1878dafce3f0..9ca55cba185b9de566f911b08d671bee
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index dfce118ec8b91eae219855a0b01392ef20b7d50c..b747b83d9b8967566d3b64ea29dd06e3ca709637 100644
index 1fb98caf0101fcbf3f045c0725c89fcbff4e7a7e..87086f25bd0939930cb7647878efdc49c3fe015d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1088,6 +1088,7 @@ public final class CraftServer implements Server {
@@ -1089,6 +1089,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
@@ -155,7 +155,7 @@ index dfce118ec8b91eae219855a0b01392ef20b7d50c..b747b83d9b8967566d3b64ea29dd06e3
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -3047,6 +3048,14 @@ public final class CraftServer implements Server {
@@ -3052,6 +3053,14 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}

4
gale-server/paper-patches/features/0005-Gale-commands.patch
View File

@@ -13,10 +13,10 @@ As part of: Paper (https://github.com/PaperMC/Paper)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9094b8e3ff1d6d07e8a39d379e40a6da7e9888ed..32ac42ec69810470941c29f7add34d03e46b4712 100644
index 87086f25bd0939930cb7647878efdc49c3fe015d..f1d84a5558d36b4fc42098f18224f5b67029edc3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1120,6 +1120,7 @@ public final class CraftServer implements Server {
@@ -1121,6 +1121,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper

4
gale-server/paper-patches/features/0008-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 32ac42ec69810470941c29f7add34d03e46b4712..ae90120eab182fcb975a13c84eed1425dc09da46 100644
index f1d84a5558d36b4fc42098f18224f5b67029edc3..0222ecaa87385fd6dbc508724cc3d9adfd98297c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1183,6 +1183,13 @@ public final class CraftServer implements Server {
@@ -1184,6 +1184,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."
));

10
gale-server/paper-patches/features/0015-CraftBukkit-UUID-to-world-map.patch
View File

@@ -13,10 +13,10 @@ 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 ae90120eab182fcb975a13c84eed1425dc09da46..67afa3b0cf9295690461e2be49249fb6f80d7082 100644
index 0222ecaa87385fd6dbc508724cc3d9adfd98297c..2f3cccd0beff2fe7239357e8a4cd6d17231302c9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -286,6 +286,7 @@ public final class CraftServer implements Server {
@@ -287,6 +287,7 @@ public final class CraftServer implements Server {
protected final DedicatedServer console;
protected final DedicatedPlayerList playerList;
private final Map<String, World> worlds = new LinkedHashMap<String, World>();
@@ -24,7 +24,7 @@ index ae90120eab182fcb975a13c84eed1425dc09da46..67afa3b0cf9295690461e2be49249fb6
// private final Map<Class<?>, Registry<?>> registries = new HashMap<>(); // Paper - replace with RegistryAccess
private YamlConfiguration configuration;
private YamlConfiguration commandsConfiguration;
@@ -1529,6 +1530,7 @@ public final class CraftServer implements Server {
@@ -1530,6 +1531,7 @@ public final class CraftServer implements Server {
this.getLogger().log(Level.SEVERE, null, ex);
}
@@ -32,7 +32,7 @@ index ae90120eab182fcb975a13c84eed1425dc09da46..67afa3b0cf9295690461e2be49249fb6
this.worlds.remove(world.getName().toLowerCase(Locale.ROOT));
this.console.removeLevel(handle);
return true;
@@ -1547,12 +1549,7 @@ public final class CraftServer implements Server {
@@ -1548,12 +1550,7 @@ public final class CraftServer implements Server {
@Override
public World getWorld(UUID uid) {
@@ -46,7 +46,7 @@ index ae90120eab182fcb975a13c84eed1425dc09da46..67afa3b0cf9295690461e2be49249fb6
}
// Paper start
@@ -1570,6 +1567,7 @@ public final class CraftServer implements Server {
@@ -1571,6 +1568,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
gale-server/paper-patches/features/0016-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 5df7c8133a8c982e6ffe9c57c58cfb22ccd874f4..05821d59d043a116e3fd779ed7be2624055ec886 100644
index 2f3cccd0beff2fe7239357e8a4cd6d17231302c9..36f1a44b18f7d93697839cc496529b30f458212d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3102,6 +3102,23 @@ public final class CraftServer implements Server {
@@ -3107,6 +3107,23 @@ public final class CraftServer implements Server {
};
}

4
gale-server/paper-patches/features/0017-5-second-TPS-average.patch
View File

@@ -58,10 +58,10 @@ index 12b327eea95e0de9e9c39b7d039badee8ec46508..6178f0212214a2a075cea60c758dca79
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 05821d59d043a116e3fd779ed7be2624055ec886..50ff4a923291a06a52e91059b02194a15f87d6d6 100644
index 36f1a44b18f7d93697839cc496529b30f458212d..24384fe9cc5e28cee7a33ff6be486f4f25943883 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3102,7 +3102,26 @@ public final class CraftServer implements Server {
@@ -3107,7 +3107,26 @@ public final class CraftServer implements Server {
};
}

4
gale-server/paper-patches/features/0018-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 50ff4a923291a06a52e91059b02194a15f87d6d6..1b1720343d3b07a73490f66520c7df12005adbcc 100644
index 24384fe9cc5e28cee7a33ff6be486f4f25943883..b51e07e06d9b593f890bf97e39c2c5672536d313 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3342,4 +3342,21 @@ public final class CraftServer implements Server {
@@ -3347,4 +3347,21 @@ public final class CraftServer implements Server {
this.console.addPluginAllowingSleep(plugin.getName(), value);
}
// Paper end - API to check if the server is sleeping

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=org.galemc.gale
version=1.21.4-R0.1-SNAPSHOT
mcVersion=1.21.4
paperRef=a838a886dcbc93664283034a41673e802a6b3098
paperRef=76753219c42b58611b5855c14a50661bcfc47026
org.gradle.configuration-cache=true
org.gradle.caching=true