Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2026-01-06 15:41:49 +00:00
Code Issues Releases Activity

Fix enderpearls using the current pos when checking if it's safe to teleport

Browse Source
This commit is contained in:
Samsuik
2025-09-28 14:12:28 +01:00
parent 3246217d29
commit e2666accc4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sakura-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownEnderpearl.java.patch
View File

@@ -6,7 +6,7 @@
if (owner instanceof ServerPlayer serverPlayer) { if (owner instanceof ServerPlayer serverPlayer) {
+ // Sakura start - prevent ender pearls teleporting inside blocks + // Sakura start - prevent ender pearls teleporting inside blocks
+ if (this.level().sakuraConfig().entity.enderPearl.preventTeleportingInsideBlocks && serverPlayer.insideAnyCollisionAt(serverLevel, vec3)) { + if (this.level().sakuraConfig().entity.enderPearl.preventTeleportingInsideBlocks && serverPlayer.insideAnyCollisionAt(serverLevel, vec3)) {
+ vec3 = Vec3.atBottomCenterOf(this.blockPosition()); // teleportation position + vec3 = Vec3.atBottomCenterOf(BlockPos.containing(vec3)); // teleportation position
+ if (serverPlayer.insideAnyCollisionAt(serverLevel, vec3)) { + if (serverPlayer.insideAnyCollisionAt(serverLevel, vec3)) {
+ this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT); + this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.HIT);
+ return; + return;