mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
cc6fd371b2
Fixes #6357 Closes #6508 Closes #6358
23 lines
995 B
Diff
23 lines
995 B
Diff
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
|
|
index c30b53d07bcd2575d65c323d8170573bbe85f212..d25fe9cb2cf755f3e34a79ce87ed38c1ffada53f 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
|
@@ -253,6 +253,11 @@ public class FishingHook extends Projectile {
|
|
|
|
this.setDeltaMovement(this.getDeltaMovement().scale(0.92D));
|
|
this.reapplyPosition();
|
|
+ // Paper start - These shouldn't be going through portals
|
|
+ if (this.isInsidePortal) {
|
|
+ this.discard();
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
}
|
|
|