mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-21 07:49:29 +00:00
13f012eb71
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@84f6e6e Fix max temper API for llama (#10823) PaperMC/Paper@672c077 handle BODY slot for non-mobs (#10822) PaperMC/Paper@716b868 Use RegistryOps for loadAdvancement (#10799) PaperMC/Paper@d9e659a Allow firework effects with no colors (#10814) PaperMC/Paper@7e2b682 Fix skipping custom block entity tag (#10812) PaperMC/Paper@ed85aac Flatten namespaced vanilla command alias redirects (#10821) PaperMC/Paper@a31dc90 Several fixes and new api for experience merging/stacking (#9242) PaperMC/Paper@efd91e5 Add registry-related argument types (#10770) PaperMC/Paper@27d2ed8 Extend fishing API (#10634) PaperMC/Paper@0fcf3e3 Deprecate InvAction#HOTBAR_MOVE_AND_READD (#10784) PaperMC/Paper@8e6554a Fix sending disconnect packet in phases where it doesn't exist PaperMC/Paper@06e69c8 Use CommandSourceStack in AsyncPlayerSendCommandsEvent (#10826) PaperMC/Paper@a47e11d fix knockback events (#10831) PaperMC/Paper@3181470 Add entity heal API (#10267) PaperMC/Paper@0513374 Fire TabCompleteEvent for legacy commands (#10834) PaperMC/Paper@5d8e53d Fix CommandSourceStack#bypassSelectorPermissions (#10837) PaperMC/Paper@ac64751 Use RegistryOps in the correct places (#10843) PaperMC/Paper@54fbd0c clarify what getEntityId actually returns (#10839) PaperMC/Paper@b8f2101 Only assign blockstate data if super ctor did not (#10841) PaperMC/Paper@4f13be9 Do not perform chunk existance check for I/O scheduling PaperMC/Paper@79c1ce1 Add since to deprecated for removals (#10848) PaperMC/Paper@88d76d9 Make Bogged implement Shearable (#10844) PaperMC/Paper@bd5867a Handle alpha channel from potion_contents component (#10808)
20 lines
1.2 KiB
Diff
20 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samsuik <kfian294ma4@gmail.com>
|
|
Date: Thu, 6 Jun 2024 20:34:29 +0100
|
|
Subject: [PATCH] Add option for fishing hooks pulling entities
|
|
|
|
|
|
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 d9deb1b47b2430936d74e782cfc4a6ac32a16c91..218b6a72a76b8acfd55952265b34fefafbce3cc3 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
|
|
@@ -615,7 +615,7 @@ public class FishingHook extends Projectile {
|
|
public void pullEntity(Entity entity) {
|
|
Entity entity1 = this.getOwner();
|
|
|
|
- if (entity1 != null) {
|
|
+ if (entity1 != null && (this.level().sakuraConfig().players.fishingHooksPullEntities || entity instanceof ItemEntity)) { // Sakura - Add option for fishing hooks pulling entities
|
|
Vec3 vec3d = (new Vec3(entity1.getX() - this.getX(), entity1.getY() - this.getY(), entity1.getZ() - this.getZ())).scale(0.1D);
|
|
|
|
entity.setDeltaMovement(entity.getDeltaMovement().add(vec3d));
|