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@fd69140d Fix `disable-tripwire-updates` option not cancelling tripwire hook updates (#12129)
PaperMC/Paper@3b9106c7 Readd dead redirect recovery (#12136)
PaperMC/Paper@d26a9e90 Fix plugin commands (#12144)
PaperMC/Paper@142695eb Default minecraft alias to redirect (#12146)
PaperMC/Paper@e494f289 Correctly call BlockFadeEvents (#12141)
PaperMC/Paper@b386a8f5 Add simpler JavaPlugin command registration (#12142)
PaperMC/Paper@f0700818 Remove Experimental from TypedKey (#12134)
PaperMC/Paper@09f1f88f Fix getForwards/SidewaysMovement for players (#12140)
This commit is contained in:
Dreeam-qwq
2025-02-18 00:12:28 +00:00
parent 73519d55c5
commit 55793e9deb
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gale-server/minecraft-patches/features/0004-Remove-vanilla-profiler.patch
View File

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
index 0853bd176aa9b583c967c3d868ee7eb32ce22d6f..2caa4f90e15b8cc6343187dbf7db58afd20a0273 100644
index f8969a68cd352ce4fe5109205e78f5e19ab6e020..9a25fea61abf062571d1261a0d9664d02782377a 100644
--- a/net/minecraft/commands/Commands.java
+++ b/net/minecraft/commands/Commands.java
@@ -55,7 +55,6 @@ import net.minecraft.server.commands.CloneCommands;
@@ -56,7 +56,7 @@ index 0853bd176aa9b583c967c3d868ee7eb32ce22d6f..2caa4f90e15b8cc6343187dbf7db58af
import net.minecraft.util.profiling.jfr.JvmProfiler;
import net.minecraft.world.flag.FeatureFlagSet;
import net.minecraft.world.flag.FeatureFlags;
@@ -159,7 +157,6 @@ public class Commands {
@@ -164,7 +162,6 @@ public class Commands {
DamageCommand.register(this.dispatcher, context);
DataCommands.register(this.dispatcher);
DataPackCommand.register(this.dispatcher);
@@ -64,7 +64,7 @@ index 0853bd176aa9b583c967c3d868ee7eb32ce22d6f..2caa4f90e15b8cc6343187dbf7db58af
DefaultGameModeCommands.register(this.dispatcher);
DifficultyCommand.register(this.dispatcher);
EffectCommands.register(this.dispatcher, context);
@@ -328,7 +325,6 @@ public class Commands {
@@ -349,7 +346,6 @@ public class Commands {
public void performCommand(ParseResults<CommandSourceStack> parseResults, String command, String label, boolean throwCommandError) {
// Paper end
CommandSourceStack commandSourceStack = parseResults.getContext().getSource();
@@ -72,7 +72,7 @@ index 0853bd176aa9b583c967c3d868ee7eb32ce22d6f..2caa4f90e15b8cc6343187dbf7db58af
ContextChain contextChain = this.finishParsing(parseResults, command, commandSourceStack, label); // CraftBukkit // Paper - Add UnknownCommandEvent
try {
@@ -365,8 +361,6 @@ public class Commands {
@@ -386,8 +382,6 @@ public class Commands {
commandSourceStack.sendFailure(Component.literal(Util.describeError(var12)));
LOGGER.error("'/{}' threw an exception", command, var12);
}
@@ -81,7 +81,7 @@ index 0853bd176aa9b583c967c3d868ee7eb32ce22d6f..2caa4f90e15b8cc6343187dbf7db58af
}
}
@@ -423,7 +417,7 @@ public class Commands {
@@ -444,7 +438,7 @@ public class Commands {
int max = Math.max(1, server.getGameRules().getInt(GameRules.RULE_MAX_COMMAND_CHAIN_LENGTH));
int _int = server.getGameRules().getInt(GameRules.RULE_MAX_COMMAND_FORK_COUNT);
@@ -536,7 +536,7 @@ index d61dcc909a04fb024df509b88dbe5cd455aad622..8b42972dde96f04ba0de53e57e192edf
public static class TickTimes {
private final long[] times;
diff --git a/net/minecraft/server/ReloadableServerResources.java b/net/minecraft/server/ReloadableServerResources.java
index d56ade6f45057f8c056152c08ad6258a9716604d..432a29d3692669f49e453e289d52c70fe45e5564 100644
index 84e2b940ab8301b789a01d5b739d69cb50db5bf4..f4205dca158f90450892af1223cc7912e494c05e 100644
--- a/net/minecraft/server/ReloadableServerResources.java
+++ b/net/minecraft/server/ReloadableServerResources.java
@@ -98,7 +98,7 @@ public class ReloadableServerResources {

6
gale-server/minecraft-patches/features/0074-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
View File

@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
index 2caa4f90e15b8cc6343187dbf7db58afd20a0273..fadc6c2494ac3aaa426d16d36adc688e1f39e27a 100644
index 9a25fea61abf062571d1261a0d9664d02782377a..66839bc2ac5746e355713cb006f249f71230a361 100644
--- a/net/minecraft/commands/Commands.java
+++ b/net/minecraft/commands/Commands.java
@@ -476,6 +476,7 @@ public class Commands {
@@ -497,6 +497,7 @@ public class Commands {
private void runSync(ServerPlayer player, java.util.Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootCommandNode) {
// Paper end - Perf: Async command map building
new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootCommandNode, true).callEvent(); // Paper - Brigadier API
@@ -48,7 +48,7 @@ index 2caa4f90e15b8cc6343187dbf7db58afd20a0273..fadc6c2494ac3aaa426d16d36adc688e
org.bukkit.event.player.PlayerCommandSendEvent event = new org.bukkit.event.player.PlayerCommandSendEvent(player.getBukkitEntity(), new java.util.LinkedHashSet<>(bukkit));
event.getPlayer().getServer().getPluginManager().callEvent(event);
@@ -486,6 +487,7 @@ public class Commands {
@@ -507,6 +508,7 @@ public class Commands {
}
}
// CraftBukkit end

4
gale-server/paper-patches/features/0014-Reduce-array-allocations.patch
View File

@@ -98,10 +98,10 @@ index db92261a6cb3758391108361096417c61bc82cdc..1a14fddb36ca3c14d243304db629d0c5
public SortedList(final E[] elements, final Comparator<? super E> comparator) {
diff --git a/src/main/java/io/papermc/paper/command/brigadier/PaperCommands.java b/src/main/java/io/papermc/paper/command/brigadier/PaperCommands.java
index f9a370433d796e0d5905ea8cf83da5b8a1a8e703..d980ef4ca93baf4085ff79d40db14117a091c90f 100644
index 4b6d845423ca845cb8780499757d627773c688da..9c2864675bc0b13ba088ba699be3c5692c2fa0a4 100644
--- a/src/main/java/io/papermc/paper/command/brigadier/PaperCommands.java
+++ b/src/main/java/io/papermc/paper/command/brigadier/PaperCommands.java
@@ -174,7 +174,7 @@ public class PaperCommands implements Commands, PaperRegistrar<LifecycleEventOwn
@@ -175,7 +175,7 @@ public class PaperCommands implements Commands, PaperRegistrar<LifecycleEventOwn
})
)
.executes((stack) -> {

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=8eb8e44ac32a99f53da7af50e800ac8831030580
paperRef=09f1f88f58a03f61092f8636ad780d42db87d8d9
org.gradle.configuration-cache=true
org.gradle.caching=true