9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-04 15:31:45 +00:00

Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2df5bba Log throwable when failing to save chunk/poi/entity data
PaperMC/Paper@44c3dd0 fix exact choice shapeless recipes (#10973)
This commit is contained in:
Dreeam
2024-07-18 06:44:23 +08:00
parent 8241709b84
commit d95dc9d8a0
20 changed files with 128 additions and 174 deletions

View File

@@ -26,10 +26,10 @@ index b47a8a082170bcb630c4354be7c77a4cac71d105..b49e3f2cdc1fa5ff3723fae452404664
double d1 = (double) (center.y - maxRange);
double d2 = (double) (center.x + maxRange);
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 60455f936a9f8a517b62f867ec4a7ac767dc5783..4a69885e173cebc8ab427e02145e1020282ea95d 100644
index 1200a11f0382801aa90afe4c0d5c6b6ca0e8e93f..a5ed3eef0f66a44a9ce1effff19dbde7c1caa4ab 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -468,7 +468,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -465,7 +465,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
long l = k * k;
int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
int j1 = this.getCoprime(i1);
@@ -38,7 +38,7 @@ index 60455f936a9f8a517b62f867ec4a7ac767dc5783..4a69885e173cebc8ab427e02145e1020
for (int l1 = 0; l1 < i1; ++l1) {
int i2 = (k1 + j1 * l1) % i1;
@@ -507,7 +507,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -504,7 +504,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
long l = k * k;
int i1 = l > 2147483647L ? Integer.MAX_VALUE : (int) l;
int j1 = this.getCoprime(i1);