aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/1013-Collision-optimisations.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2024-04-27 18:00:01 -0700
committerJake Potrebic <[email protected]>2024-04-27 18:00:01 -0700
commit3e90a1918392a435cbfe40eea6f077076faf275a (patch)
tree38708c74d12698274d2632efd230ab024e4d77de /patches/server/1013-Collision-optimisations.patch
parentd964c15e15bff629b4999fbf3df09c5b1e6e2049 (diff)
downloadPaper-3e90a1918392a435cbfe40eea6f077076faf275a.tar.gz
Paper-3e90a1918392a435cbfe40eea6f077076faf275a.zip
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 304e83eb PR-1002: Improve documentation and implementation of getMaxStackSize e8215ea2 SPIGOT-7638: Library loader does not seem to resolve every dependency 79c595c0 SPIGOT-7637: Bad logic in checking nullability of AttributeModifier slots CraftBukkit Changes: 91b1fc3f1 SPIGOT-7644: Fix ItemMeta#getAsString 4e77a81e1 SPIGOT-7615: PlayerLeashEntityEvent cancelled eats lead 996f660f3 Do not remove leash knot if leasing to an existing leash knot gets cancelled f70367d42 SPIGOT-7643: Fix inverted leash event cancelled usage and remove leash knot if no entity gets leashed 7ddb48294 SPIGOT-7640: Abnormal jumping height of wind charge 080c8711e SPIGOT-7639: Incoming plugin channels not working ad549847e Open a direct connection instead of pinging mojang server to check if it is reachable 38e2926c5 SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime
Diffstat (limited to 'patches/server/1013-Collision-optimisations.patch')
-rw-r--r--patches/server/1013-Collision-optimisations.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/1013-Collision-optimisations.patch b/patches/server/1013-Collision-optimisations.patch
index a6179487ff..1d14ead3c6 100644
--- a/patches/server/1013-Collision-optimisations.patch
+++ b/patches/server/1013-Collision-optimisations.patch
@@ -2179,10 +2179,10 @@ index 03c45ee77276462818a6f774b5945b25924aa3f0..ab289a6ca85459e03acb2089c6b9e931
private Direction(
final int id,
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e06b9b0c7b1c3a200b89819e0e521f1c88dc981b..ed42a78aebeda86b77f27cba4fcefbc6c17f86fc 100644
+index a0d16e8289d6e35bb1e92623642386ac0c0552be..9079a7c4ca27eedc346312282d6f6f78ca6fd205 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -512,7 +512,7 @@ public class ServerPlayer extends Player {
+@@ -522,7 +522,7 @@ public class ServerPlayer extends Player {
if (blockposition1 != null) {
this.moveTo(blockposition1, world.getSharedSpawnAngle(), 0.0F); // Paper - MC-200092 - fix first spawn pos yaw being ignored
@@ -2191,7 +2191,7 @@ index e06b9b0c7b1c3a200b89819e0e521f1c88dc981b..ed42a78aebeda86b77f27cba4fcefbc6
break;
}
}
-@@ -520,7 +520,7 @@ public class ServerPlayer extends Player {
+@@ -530,7 +530,7 @@ public class ServerPlayer extends Player {
} else {
this.moveTo(blockposition, world.getSharedSpawnAngle(), 0.0F); // Paper - MC-200092 - fix first spawn pos yaw being ignored