papermc/patches/server/0114-Don-t-let-fishinghooks-use-portals.patch

23 lines
995 B
Diff
Raw Normal View History

2021-06-11 12:02:28 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 16 Dec 2016 16:03:19 -0600
Subject: [PATCH] Don't let fishinghooks use portals
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
2021-11-23 13:22:49 +00:00
index eaa3ed52a57b56fc0f260aadfd23c2fd6dfc0f51..54bd343def9f1ebc987640c5d756db906593f320 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
2021-11-23 13:22:49 +00:00
@@ -252,6 +252,11 @@ public class FishingHook extends Projectile {
2021-06-11 12:02:28 +00:00
this.setDeltaMovement(this.getDeltaMovement().scale(0.92D));
this.reapplyPosition();
+ // Paper start - These shouldn't be going through portals
+ if (this.isInsidePortal) {
+ this.discard();
2021-06-11 12:02:28 +00:00
+ }
+ // Paper end
}
}