NanaChiyo0721/Shiroha
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix patch conflict

Browse Source
This commit is contained in:
NanaChiyo0721
2026-07-27 20:47:44 +08:00
parent 10cc76bbff
commit 484990074d
20 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shiroha-server/minecraft-patches/features/0001-Config-system-framework.patch
+2 -2
View File
@@ -5,10 +5,10 @@ Subject: [PATCH] Config system framework
diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
index a4d608d64b7d3477c9144d93547fd3b4f39a1b02..f588a46d019e205be0775f0fd59dea3a57207ea4 100644
index e2939cc39a8c103e4c4d7b01d39b5546486e4fbc..8777d662148e41fae9e137a473e47e8b9b5abbfb 100644
--- a/net/minecraft/server/Main.java
+++ b/net/minecraft/server/Main.java
@@ -107,6 +107,7 @@ public class Main {
@@ -110,6 +110,7 @@ public class Main {
JvmProfiler.INSTANCE.start(Environment.SERVER);
}
shiroha-server/minecraft-patches/features/0003-Correct-player-respawn-place.patch
+2 -2
View File
@@ -5,7 +5,7 @@ Subject: [PATCH] Correct player respawn place
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index fbe0ef19bfabfc42d9e0e08e17b08159321b3804..846b150c221fe82aef557e4fb72446dba33aa40d 100644
index 57f93d978fe48fdf6e77b7bfb9f1de060e1a8524..d1e7f7fc38e694e873d3cbc0bd6e7f3009c36abf 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -511,8 +511,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -43,7 +43,7 @@ index fbe0ef19bfabfc42d9e0e08e17b08159321b3804..846b150c221fe82aef557e4fb72446db
if (inChunk == null) {
continue;
}
@@ -2018,7 +2030,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -1997,7 +2009,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
}
if (newLevel.dimension() == lastDimension) {
shiroha-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch
+2 -2
View File
@@ -6,10 +6,10 @@ Subject: [PATCH] Do not enable any debug subscriptions
Really this would really crash the server by accident when the operators used F3 + J or toggled the debug synchronizer
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index 846b150c221fe82aef557e4fb72446dba33aa40d..e66cfcaa92b90f6b0fd26fd3cec1a5cdbb025117 100644
index d1e7f7fc38e694e873d3cbc0bd6e7f3009c36abf..9168259d0adfd7adb7145f281d0641b0abf111a7 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -3504,7 +3504,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -3483,7 +3483,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
}
public Set<DebugSubscription<?>> debugSubscriptions() {
shiroha-server/minecraft-patches/features/0009-Entity-portal-teleport-speed-fix.patch
+1 -1
View File
@@ -54,7 +54,7 @@ index c6434ff2e5c211887c2e98c8462a49e0e1cb5b21..d25b1c7d1347b2731cd12cdcea719027
} else {entity.inactiveTick();} // Paper - EAR 2
profiler.pop();
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index a2b57f62b745dd21e215f919d335f14f5cb1706f..af3a85087d292d3782acf4c7d15fbfb9f749868d 100644
index 07310ae30817fc88227355739074615969b48184..fe95ab473e8a7b3a9e7a571028d3d8af01000f0b 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -387,6 +387,7 @@ public abstract class Entity
shiroha-server/minecraft-patches/features/0013-Fix-riding-statistics-desync.patch
+3 -3
View File
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix riding statistics desync
Referred to: https://github.com/CraftCanvasMC/Canvas/commit/057175b0c10d5a4d1d9059fd9d077750c32633b2
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index e66cfcaa92b90f6b0fd26fd3cec1a5cdbb025117..b08af3a31b80125d02a4f2ff85311d2f9fdcc0ae 100644
index 9168259d0adfd7adb7145f281d0641b0abf111a7..ada7dd26b52cd923bc78e6e6a513a2a1c592793d 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -2537,7 +2537,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -2516,7 +2516,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
}
}
@@ -19,7 +19,7 @@ index e66cfcaa92b90f6b0fd26fd3cec1a5cdbb025117..b08af3a31b80125d02a4f2ff85311d2f
int distance = Math.round((float)Math.sqrt(dx * dx + dy * dy + dz * dz) * 100.0F);
Entity vehicle = this.getVehicle();
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index af3a85087d292d3782acf4c7d15fbfb9f749868d..aa3ed23fbfd85117101e4ef15123b48d9673c5b0 100644
index fe95ab473e8a7b3a9e7a571028d3d8af01000f0b..65aa51503e49c72d3a588c4843eae6ab8992f782 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -4199,7 +4199,13 @@ public abstract class Entity
shiroha-server/minecraft-patches/features/0014-Fix-player-auto-saving-ignores-interval.patch
+1 -1
View File
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix player auto saving ignores interval
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index b08af3a31b80125d02a4f2ff85311d2f9fdcc0ae..5f5c8f20169015627a265d0a974e89cb47a4a70c 100644
index ada7dd26b52cd923bc78e6e6a513a2a1c592793d..1e40cc6f9bfd172a42a8f9624eb2fb554c6f11cf 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -208,7 +208,7 @@ import org.slf4j.Logger;
shiroha-server/minecraft-patches/features/0015-Fix-dragon-part-desync.patch
+1 -1
View File
@@ -17,7 +17,7 @@ index b31b55f00e2ce1bd6c1011fe852bd1dbb37de524..772e07af051b0f88582434b4cfcba42a
}
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index aa3ed23fbfd85117101e4ef15123b48d9673c5b0..fee93b64bc42cd49ea9ff007e2fbd7d4ef80d58b 100644
index 65aa51503e49c72d3a588c4843eae6ab8992f782..c67963f6d514c7a967aea834fe243c5e009435b7 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -4459,6 +4459,7 @@ public abstract class Entity
shiroha-server/minecraft-patches/features/0016-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch
+1 -1
View File
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix misbehaved ender pearls when player switched dimension
diff --git a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java
index 501a0e89cc7bcfce6793f059b080b38666e0fb64..e8015ed6f4885fb324964a44752014bf0bbd7326 100644
index d0dba5cc351903fb762e231a95f302479794185f..465b21e6f787938993cc329873a826d9454fcd4b 100644
--- a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java
+++ b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java
@@ -264,7 +264,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
shiroha-server/minecraft-patches/features/0018-Fix-high-velocity-moving-issue.patch
+1 -1
View File
@@ -8,7 +8,7 @@ On folia, entity usually cannot move out of the tickregion, but sometimes it act
Reference from : https://github.com/KaiijuMC/Kaiiju/blob/ver/1.20.1/patches/server/0040-Teleport-async-if-we-cannot-move-entity-off-main.patch
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index fee93b64bc42cd49ea9ff007e2fbd7d4ef80d58b..375d4a504cd3f2f2495315cc7456dd245e9d2547 100644
index c67963f6d514c7a967aea834fe243c5e009435b7..4a5266e3e15e765dda4b2aac54bf0eb90291b096 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -1163,6 +1163,19 @@ public abstract class Entity
shiroha-server/minecraft-patches/features/0019-Fix-teleport-missing-original-rotation-and-velocity.patch
+1 -1
View File
@@ -33,7 +33,7 @@ index 13d7965fd4f99f0848b080349df41f8b1c31a19b..4e58868bfb23671bde6296ee93619315
nmsEntity.stopRiding();
nmsEntity.teleportAsync(
diff --git a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java
index e8015ed6f4885fb324964a44752014bf0bbd7326..93aee574b340739c6686f8ad9ab523e6257023f7 100644
index 465b21e6f787938993cc329873a826d9454fcd4b..35ec38780ed3c171fb9ae522a4693ac69ace5b2e 100644
--- a/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java
+++ b/net/minecraft/world/entity/projectile/throwableitemprojectile/ThrownEnderpearl.java
@@ -99,7 +99,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
shiroha-server/minecraft-patches/features/0030-Kaiiju-Vanilla-end-portal-teleportation.patch
+17 -13
View File
@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MrHua269 <mrhua269@gmail.com>
Date: Wed, 8 Jul 2026 22:35:59 +0800
From: NanaChiyo0721 <nanachiyo0721@163.com>
Date: Mon, 27 Jul 2026 20:43:17 +0800
Subject: [PATCH] Kaiiju: Vanilla end portal teleportation
Co-authored by: Sofiane H. Djerbi <46628754+kugge@users.noreply.github.com>
@@ -8,10 +8,10 @@ As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2e
Licensed under: GPL-3.0 (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/LICENSE)
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index 375d4a504cd3f2f2495315cc7456dd245e9d2547..319997dca2b461b41b02ca2d9b0e3ed9fd05ac88 100644
index 4a5266e3e15e765dda4b2aac54bf0eb90291b096..bf5b6922fbe7d631c429d337001a4d2cd919fbe3 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -4640,14 +4640,18 @@ public abstract class Entity
@@ -4640,15 +4640,19 @@ public abstract class Entity
targetPos, 16, // load 16 blocks to be safe from block physics
ca.spottedleaf.concurrentutil.util.Priority.HIGH,
(chunks) -> {
@@ -28,13 +28,14 @@ index 375d4a504cd3f2f2495315cc7456dd245e9d2547..319997dca2b461b41b02ca2d9b0e3ed9
portalInfoCompletable.complete(
new net.minecraft.world.level.portal.TeleportTransition(
- destination, Vec3.atBottomCenterOf(targetPos.below()), Vec3.ZERO, Direction.WEST.toYRot(), 0.0f,
- Relative.union(Relative.DELTA, Set.of(Relative.X_ROT)),
+ destination, finalPos, this.getDeltaMovement(), Direction.WEST.toYRot(), 0.0f, // Kaiiju - Vanilla end teleportation
+ /*Relative.union(Relative.DELTA, Set.of(Relative.X_ROT))*/Set.of(), // Kaiiju - Vanilla end teleportation
false, false,
- Relative.union(Relative.DELTA, Set.of(Relative.X_ROT)),
+ java.util.Collections.EMPTY_SET, // Kaiiju - Vanilla end teleportation
TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
)
@@ -4662,11 +4666,15 @@ public abstract class Entity
org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL,
TeleportTransition.PassengerTeleportationMode.POSITION_RIDER
@@ -4664,13 +4668,17 @@ public abstract class Entity
ca.spottedleaf.concurrentutil.util.Priority.HIGH,
(chunks) -> {
BlockPos adjustedSpawn = destination.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, spawnPos);
@@ -49,10 +50,13 @@ index 375d4a504cd3f2f2495315cc7456dd245e9d2547..319997dca2b461b41b02ca2d9b0e3ed9
new net.minecraft.world.level.portal.TeleportTransition(
- destination, Vec3.atBottomCenterOf(adjustedSpawn), Vec3.ZERO, 0.0f, 0.0f,
+ destination, finalPos, this.getDeltaMovement(), 0.0f, 0.0f, // Kaiiju - Vanilla end teleportation
Relative.union(Relative.DELTA, Relative.ROTATION),
false, false,
- Relative.union(Relative.DELTA, Relative.ROTATION),
+ java.util.Collections.EMPTY_SET, // Kaiiju - Vanilla end teleportation
TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
@@ -4845,6 +4853,10 @@ public abstract class Entity
org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL,
TeleportTransition.PassengerTeleportationMode.POSITION_RIDER
@@ -4849,6 +4857,10 @@ public abstract class Entity
return false;
}
@@ -63,7 +67,7 @@ index 375d4a504cd3f2f2495315cc7456dd245e9d2547..319997dca2b461b41b02ca2d9b0e3ed9
Vec3 initialPosition = this.position();
ChunkPos initialPositionChunk = new ChunkPos(
ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(initialPosition),
@@ -4908,9 +4920,14 @@ public abstract class Entity
@@ -4912,9 +4924,14 @@ public abstract class Entity
info.postTeleportTransition().onTransition(teleported);
}
shiroha-server/minecraft-patches/features/0034-Add-config-for-unsafe-teleportation.patch
+1 -1
View File
@@ -27,7 +27,7 @@ index 480b6b2405706fd4d7158d0e160adafd84099887..51ccfda1d7579cb4109d78e3cc3942d0
}
}
diff --git a/net/minecraft/world/level/block/EndPortalBlock.java b/net/minecraft/world/level/block/EndPortalBlock.java
index d42bb2a1721e4ab8c9956e18c3ca418b8d648c59..a7066cc2083302c50be008d38e466c5d33aa85e5 100644
index 123df098fa987030fe3789f36ff95aeee2979834..4c92fee3fbb3d739a9ed962d39395a118db853fa 100644
--- a/net/minecraft/world/level/block/EndPortalBlock.java
+++ b/net/minecraft/world/level/block/EndPortalBlock.java
@@ -76,6 +76,12 @@ public class EndPortalBlock extends BaseEntityBlock implements Portal {
shiroha-server/minecraft-patches/features/0039-Add-force-the-data-command-to-be-enabled-config.patch
+1 -1
View File
@@ -5,7 +5,7 @@ Subject: [PATCH] Add force the data command to be enabled config
diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
index bc9f6cc286536b87513de81855ad0b61cf787c84..6f0e1eae0cdc488d7afad18017205f3cd20e994a 100644
index 4ddb5e7ce3529466c3930caa9aa6b18158e9a63d..22c7cddef55727ad00f909e551f40a544316e5ca 100644
--- a/net/minecraft/commands/Commands.java
+++ b/net/minecraft/commands/Commands.java
@@ -202,7 +202,9 @@ public class Commands {
shiroha-server/minecraft-patches/features/0043-Add-config-to-enable-tick-command.patch
+1 -1
View File
@@ -47,7 +47,7 @@ index e9d22c4b5f30284ca8e026533c24dca2bdb3001d..724332d074bd7d3dfdcb60e83cf1fd6c
this.scheduler.regionFailed(this, false, thr);
// regionFailed will schedule a shutdown, so we should avoid letting this region tick further
diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
index 6f0e1eae0cdc488d7afad18017205f3cd20e994a..570c3523821155d4272161608db7f11a525a783b 100644
index 22c7cddef55727ad00f909e551f40a544316e5ca..9b411a23545572ff38f624b0a5ac7053935076ea 100644
--- a/net/minecraft/commands/Commands.java
+++ b/net/minecraft/commands/Commands.java
@@ -259,7 +259,11 @@ public class Commands {
shiroha-server/minecraft-patches/features/0046-Add-status-bar.patch
+3 -3
View File
@@ -106,7 +106,7 @@ index ecb1b98723e78e9d2f3ce182be8f78f8f32a52da..ce0dca54b551c67797e197f848334f34
}
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index 5f5c8f20169015627a265d0a974e89cb47a4a70c..421882473989084d387f7fc1c2fc6d1ad570f18c 100644
index 1e40cc6f9bfd172a42a8f9624eb2fb554c6f11cf..bbd6fed7f31a0806247ca140c868f323e6068a47 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -889,6 +889,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -171,10 +171,10 @@ index f03fa06c0ba56f7f5e1e45bc1568a490751efde3..eee1c14249addbf4714df733870da974
+ // KioCG end
}
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index 319997dca2b461b41b02ca2d9b0e3ed9fd05ac88..d03267acc5209512e15065fcfb2dd32e9eb2f878 100644
index bf5b6922fbe7d631c429d337001a4d2cd919fbe3..9ec6e74acaf25c33438ca8713b80d5b5a9613b19 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -6421,4 +6421,6 @@ public abstract class Entity
@@ -6432,4 +6432,6 @@ public abstract class Entity
return ((ServerLevel) this.level()).isPositionEntityTicking(this.blockPosition());
}
// Paper end
shiroha-server/minecraft-patches/features/0048-Leaves-Lithium-Sleeping-Block-Entity.patch
+2 -2
View File
@@ -240,7 +240,7 @@ index 6e08d50794c4af4405f3e164a3fd46f376b3f78f..dd2d0940eece3e85078e574f66f71a4c
int getContainerSize();
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index d03267acc5209512e15065fcfb2dd32e9eb2f878..17129f6c094b976a209e25773bef24d4b38f4156 100644
index 9ec6e74acaf25c33438ca8713b80d5b5a9613b19..66f1f80c172e464a57d63679a8d13729c480a1e3 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -324,7 +324,7 @@ public abstract class Entity
@@ -266,7 +266,7 @@ index d03267acc5209512e15065fcfb2dd32e9eb2f878..17129f6c094b976a209e25773bef24d4
if (copy instanceof net.minecraft.world.entity.boss.enderdragon.EnderDragon dragon) dragon.syncDragonPartsAfterTeleportTransform(); // Shiroha - Fix dragon part desync
// vanilla code used to call remove _after_ copying, and some stuff is required to be after copy - so add hook here
// for example, clearing of inventory after switching dimensions
@@ -6027,8 +6029,29 @@ public abstract class Entity
@@ -6038,8 +6040,29 @@ public abstract class Entity
this.setBoundingBox(this.makeBoundingBox());
}
// Paper end - Block invalid positions and bounding box
shiroha-server/minecraft-patches/features/0067-Gale-Skip-entity-move-if-movement-is-zero.patch
+2 -2
View File
@@ -10,7 +10,7 @@ VMP (https://github.com/RelativityMC/VMP-fabric)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index 17129f6c094b976a209e25773bef24d4b38f4156..5d52a4e0a9d32957bb74472fa385d9fab8c241f1 100644
index 66f1f80c172e464a57d63679a8d13729c480a1e3..c720d1af1bdd1e9eb8e33129b2fb1abe57685364 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -1152,8 +1152,14 @@ public abstract class Entity
@@ -28,7 +28,7 @@ index 17129f6c094b976a209e25773bef24d4b38f4156..5d52a4e0a9d32957bb74472fa385d9fa
final Vec3 originalMovement = delta; // Paper - Expose pre-collision velocity
// Paper start - detailed watchdog information
ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main");
@@ -5521,6 +5527,11 @@ public abstract class Entity
@@ -5532,6 +5538,11 @@ public abstract class Entity
}
public final void setBoundingBox(final AABB bb) {
shiroha-server/minecraft-patches/features/0072-Gale-For-collision-check-has-physics-before-same-veh.patch
+1 -1
View File
@@ -20,7 +20,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin)
Licensed under: GPL-3.0-only (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index 5d52a4e0a9d32957bb74472fa385d9fab8c241f1..2e07b56b94aaf9026320a11105caa892a943879c 100644
index c720d1af1bdd1e9eb8e33129b2fb1abe57685364..21dad4bf9e248f9769ff39461cd0fd66c9441600 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -2438,8 +2438,8 @@ public abstract class Entity
shiroha-server/minecraft-patches/features/0073-Gale-Skip-negligible-planar-movement-multiplication.patch
+1 -1
View File
@@ -7,7 +7,7 @@ License: GPL-3.0-only (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://github.com/GaleMC/Gale
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index 2e07b56b94aaf9026320a11105caa892a943879c..14edc8947cf728e0e668ac20c2b9cd53fdaa387d 100644
index 21dad4bf9e248f9769ff39461cd0fd66c9441600..e8991b08105ed611da2f0449f2a47cb0db74fed0 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -1299,8 +1299,17 @@ public abstract class Entity
shiroha-server/minecraft-patches/features/0076-Gale-Reduce-array-allocations.patch
+1 -1
View File
@@ -137,7 +137,7 @@ index 2e71a1cbabf3405e3e4fd5349a1784d895e7e60c..42de919064680b1a464d813976ca5e69
if (!itemStack.isEmpty()) {
slots.add(Pair.of(slot, itemStack.copy()));
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index 421882473989084d387f7fc1c2fc6d1ad570f18c..116568953a244b6d97935089a0b7e895b32b5cc9 100644
index bbd6fed7f31a0806247ca140c868f323e6068a47..a52b205534dd77abe5ed657893efb9c5a89da543 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -1422,7 +1422,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc