mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-19 15:09:25 +00:00
43 lines
2.1 KiB
Diff
43 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Date: Thu, 24 Nov 2022 23:15:49 +0100
|
|
Subject: [PATCH] Reduce villager item re-pickup
|
|
|
|
License: MIT (https://opensource.org/licenses/MIT)
|
|
Gale - https://galemc.org
|
|
|
|
This patch is based on the following patch:
|
|
"Slow down villager pickup of thrown items"
|
|
By: Aikar <aikar@aikar.co>
|
|
As part of: EmpireCraft (https://github.com/starlis/empirecraft)
|
|
Licensed under: MIT (https://opensource.org/licenses/MIT)
|
|
|
|
* EmpireCraft description *
|
|
|
|
Helps 1.8 Farms let hoppers pick it up before Villager
|
|
due to our hopper changes
|
|
|
|
diff --git a/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
|
|
index 2664d72c3b6906d0505df2e63c0e5075eba9461b..e7f74b4f54069ffdf74f029639cbf0756f2db095 100644
|
|
--- a/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
|
|
+++ b/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
|
|
@@ -87,7 +87,17 @@ public class BehaviorUtils {
|
|
Vec3 vec3 = offset.subtract(entity.position());
|
|
vec3 = vec3.normalize().multiply(speedMultiplier.x, speedMultiplier.y, speedMultiplier.z);
|
|
itemEntity.setDeltaMovement(vec3);
|
|
- itemEntity.setDefaultPickUpDelay();
|
|
+ // Gale start - EMC - reduce villager item re-pickup
|
|
+ if (entity instanceof net.minecraft.world.entity.npc.Villager) {
|
|
+ int repickupDelay = entity.level().galeConfig().smallOptimizations.reducedIntervals.villagerItemRepickup;
|
|
+
|
|
+ if (repickupDelay <= -1) {
|
|
+ itemEntity.setDefaultPickUpDelay();
|
|
+ } else {
|
|
+ itemEntity.pickupDelay = repickupDelay;
|
|
+ }
|
|
+ }
|
|
+ // Gale end - EMC - reduce villager item re-pickup
|
|
// CraftBukkit start
|
|
org.bukkit.event.entity.EntityDropItemEvent event = new org.bukkit.event.entity.EntityDropItemEvent(entity.getBukkitEntity(), (org.bukkit.entity.Item) itemEntity.getBukkitEntity());
|
|
itemEntity.level().getCraftServer().getPluginManager().callEvent(event);
|