Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-04 15:31:45 +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@c37b890c More deferred requireNonNull message creation
PaperMC/Paper@310f5229 Add unsupported config option and internal API to simplify remote item matching
PaperMC/Paper@6ea42025 Send all attributes on respawn (#12274)
This commit is contained in:
Dreeam-qwq
2025-03-14 00:13:39 +00:00
parent 119ea5b00a
commit 43bfa51323
6 changed files with 18 additions and 18 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

@@ -888,7 +888,7 @@ index 6540b2d6a1062d883811ce240c49d30d1925b291..9500fc2f841819b0d40e8a6e48353bb2
}
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
index 234c16344c325151d307ee19ca57739ecf73056c..4bc5a4f14a84364720c60fc91e9bf53ef1b1832c 100644
index 3223cbb7b6407bdd0e574688e2e5de2947af6ec9..6f568698939b5d995da0fa2cc493b5d513634318 100644
--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
@@ -77,8 +77,6 @@ import net.minecraft.util.ProgressListener;
@@ -1069,7 +1069,7 @@ index 234c16344c325151d307ee19ca57739ecf73056c..4bc5a4f14a84364720c60fc91e9bf53e
for (Entity entity : passengerEntity.getPassengers()) {
this.tickPassenger(passengerEntity, entity, isActive); // Paper - EAR 2
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index 57d432dc9e8d8e9a3e088e7c40b35178c30fe786..dff1e84584c66045c58f0a6fe8102a27a54716a6 100644
index 3de65c4025be91d938a350c884975cb6edc234d3..c11150dada66888e5332ec88d153dea3eca2aa3e 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -96,8 +96,6 @@ import net.minecraft.tags.FluidTags;
@@ -1081,7 +1081,7 @@ index 57d432dc9e8d8e9a3e088e7c40b35178c30fe786..dff1e84584c66045c58f0a6fe8102a27
import net.minecraft.world.Container;
import net.minecraft.world.Difficulty;
import net.minecraft.world.InteractionHand;
@@ -1426,14 +1424,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -1433,14 +1431,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
this.unsetRemoved();
*/
// CraftBukkit end
@@ -1096,7 +1096,7 @@ index 57d432dc9e8d8e9a3e088e7c40b35178c30fe786..dff1e84584c66045c58f0a6fe8102a27
// CraftBukkit start
this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
LevelData worlddata = level.getLevelData();
@@ -1450,7 +1444,6 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -1457,7 +1451,6 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
this.connection.internalTeleport(PositionMoveRotation.of(teleportTransition), teleportTransition.relatives()); // CraftBukkit - use internal teleport without event
this.connection.resetPosition();
level.addDuringTeleport(this);
@@ -1223,7 +1223,7 @@ index 64b0508ef21952c65b0b967b756b2a4c64d96899..b6b03fbbd669e6331b30255df5419611
protected abstract T prepare(ResourceManager resourceManager, ProfilerFiller profiler);
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index 379488fe40a4c9e7060b88f39f73e6ebbc88ad35..a01491bc87d982adadd1890f72e31b893dfa7619 100644
index f6a06336fa12d26ea88d1543aed8f9d41c71b949..e4ec46fdb3b3db47476cd09be767689f6f7d884f 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -78,8 +78,6 @@ import net.minecraft.tags.FluidTags;
@@ -1454,7 +1454,7 @@ index 4546aca8e2e144ec207653c713fc49f849908827..de2ed0f7850a35a5a204ca10122ac79d
if (((ServerLevel) this.level()).hasEntityMoveEvent && !(this instanceof Player)) {
if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
index 1ed07fd23985a6bf8cf8300f74c92b7531a79fc6..2568a7f2459ed783d4612546b86d46721d48a396 100644
index e330bf990e4874baed1b21cd8c9b44d66ec5b823..49f4d8d4cc36669f889d9970d1dfdf3af4a720ce 100644
--- a/net/minecraft/world/entity/Mob.java
+++ b/net/minecraft/world/entity/Mob.java
@@ -33,8 +33,6 @@ import net.minecraft.sounds.SoundEvent;

8
gale-server/minecraft-patches/features/0030-Do-not-process-chat-commands-before-player-has-joine.patch
View File

@@ -13,10 +13,10 @@ As part of: EmpireCraft (https://github.com/starlis/empirecraft)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index dff1e84584c66045c58f0a6fe8102a27a54716a6..6efb636b0a4443daa4861d35116905d54549e864 100644
index c11150dada66888e5332ec88d153dea3eca2aa3e..8a20de0780dbcec5f228f549a4134fce9714d170 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -386,6 +386,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -393,6 +393,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
public boolean joining = true;
public boolean sentListPacket = false;
public boolean supressTrackerForLogin = false; // Paper - Fire PlayerJoinEvent when Player is actually ready
@@ -25,7 +25,7 @@ index dff1e84584c66045c58f0a6fe8102a27a54716a6..6efb636b0a4443daa4861d35116905d5
public boolean isRealPlayer; // Paper
public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index bac7225ea6095a746a71d5be2ba4bf147971827b..aab9786db66740d281cf0be3ad921ccdfbc8c27e 100644
index 5582c7045a78bd69091c3bd72d221c8cbc90da6f..fdffb9dac6bba5562f584e63d52ecf45383214ab 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2342,7 +2342,7 @@ public class ServerGamePacketListenerImpl
@@ -38,7 +38,7 @@ index bac7225ea6095a746a71d5be2ba4bf147971827b..aab9786db66740d281cf0be3ad921ccd
// CraftBukkit start
if (sync) {
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
index 1fd2c7988ebb276a8ee68455d0090e7acd473ba7..22a083de59e429aca7e7f647cae7b54735efb9a1 100644
index d37df76d08d53374f862de400a379f8b76e9f241..6ed4b7c5315d7bbeefc94f1320f52e5189f93518 100644
--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
@@ -330,6 +330,8 @@ public abstract class PlayerList {

4
gale-server/minecraft-patches/features/0037-Do-not-log-Not-Secure-marker.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/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
index 23645f84f705bfbea29d7eaeaca84d0b115aae5a..a0d56fcd58f943353b55821557d79c4dc0cdf46b 100644
index 6ed4b7c5315d7bbeefc94f1320f52e5189f93518..7b8cc9e29bf021ce3b73803e820ee9b7926e05da 100644
--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
@@ -1258,7 +1258,7 @@ public abstract class PlayerList {
@@ -1263,7 +1263,7 @@ public abstract class PlayerList {
public void broadcastChatMessage(PlayerChatMessage message, Predicate<ServerPlayer> shouldFilterMessageTo, @Nullable ServerPlayer sender, ChatType.Bound boundChatType, @Nullable Function<net.kyori.adventure.audience.Audience, Component> unsignedFunction) {
// Paper end
boolean flag = this.verifyChatTrusted(message);

4
gale-server/minecraft-patches/features/0079-Broadcast-crit-animations-as-the-entity-being-critte.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/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index 9c2f9bc5e5bef96fb7ad0f04aa1cb72db9d10638..e676e2082700a2bdc2a93b0a356e4f6b1000776e 100644
index 8a20de0780dbcec5f228f549a4134fce9714d170..b44cb6db29668767d0f092ddb6382f4b2baf72b8 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -2150,12 +2150,18 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -2157,12 +2157,18 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@Override
public void crit(Entity entityHit) {

6
gale-server/minecraft-patches/features/0093-Reduce-RandomSource-instances.patch
View File

@@ -26,10 +26,10 @@ index d381800ad054be6b054dcca43fbe80d3f0c0c771..5904b9d985487ff8bd1f330667c43096
double d1 = center.y - maxRange;
double d2 = center.x + maxRange;
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index e676e2082700a2bdc2a93b0a356e4f6b1000776e..e56e930df980613a13f92d771f1036eba82b1d19 100644
index b44cb6db29668767d0f092ddb6382f4b2baf72b8..f51d699461f5aef81e1187a4068c78f844e83878 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -461,7 +461,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -468,7 +468,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
long l1 = l * l;
int i = l1 > 2147483647L ? Integer.MAX_VALUE : (int)l1;
int coprime = this.getCoprime(i);
@@ -73,7 +73,7 @@ index 1e012c7ef699a64ff3f1b00f897bb893ab25ecbd..800db05c1d2f2452a9e8ab7532f5ec10
public FishingHook(EntityType<? extends FishingHook> entityType, Level level) {
diff --git a/net/minecraft/world/entity/raid/Raid.java b/net/minecraft/world/entity/raid/Raid.java
index 27234627933ccaa70b2c51a792efb2e68104a84f..7b0de83f1eb79007c6fe0ecf00660143781d1aa6 100644
index 536c84362d3e74a5bf0e0494483da3c0e9b26f0b..b83fbdb3093dbd56a9e707a652074d0b6033a761 100644
--- a/net/minecraft/world/entity/raid/Raid.java
+++ b/net/minecraft/world/entity/raid/Raid.java
@@ -99,7 +99,7 @@ public class Raid {

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=f0388e2f3840c6f9577b389ccd163e172ce563bd
paperRef=6ea42025a49f232f47861c6ca943b0fc66b7effe
org.gradle.configuration-cache=true
org.gradle.caching=true