mirror of
https://github.com/Dreeam-qwq/Gale.git
synced 2025-12-27 18:49:11 +00:00
62 lines
3.4 KiB
Diff
62 lines
3.4 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/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
|
|
index d98b28e9488a5a7736719cf656736bb026ec8c7e..74fe07a3737728b67987ef794103346c1e428109 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
|
|
@@ -21,6 +21,7 @@ import net.minecraft.world.entity.ai.memory.NearestVisibleLivingEntities;
|
|
import net.minecraft.world.entity.ai.memory.WalkTarget;
|
|
import net.minecraft.world.entity.ai.util.DefaultRandomPos;
|
|
import net.minecraft.world.entity.item.ItemEntity;
|
|
+import net.minecraft.world.entity.npc.Villager;
|
|
import net.minecraft.world.item.Item;
|
|
import net.minecraft.world.item.ItemStack;
|
|
import net.minecraft.world.item.ProjectileWeaponItem;
|
|
@@ -99,7 +100,16 @@ public class BehaviorUtils {
|
|
|
|
vec3d2 = vec3d2.normalize().multiply(velocityFactor.x, velocityFactor.y, velocityFactor.z);
|
|
entityitem.setDeltaMovement(vec3d2);
|
|
- entityitem.setDefaultPickUpDelay();
|
|
+ // Gale start - EMC - reduce villager item re-pickup
|
|
+ if (entity instanceof Villager) {
|
|
+ int repickupDelay = entity.level().galeConfig().smallOptimizations.reducedIntervals.villagerItemRepickup;
|
|
+ if (repickupDelay <= -1) {
|
|
+ entityitem.setDefaultPickUpDelay();
|
|
+ } else {
|
|
+ entityitem.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) entityitem.getBukkitEntity());
|
|
entityitem.level().getCraftServer().getPluginManager().callEvent(event);
|
|
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
|
index a52de3800a3e4b8ff6a521c8c5edcca9d49f7473..9ac3c235a7adc42af1ba22aaa4efbce5b006f98d 100644
|
|
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
|
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
|
|
@@ -56,6 +56,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
|
|
|
|
public int acquirePoiForStuckEntity = 60; // Gale - Airplane - reduce acquire POI for stuck entities
|
|
public int checkStuckInWall = 10; // Gale - Pufferfish - reduce in wall checks
|
|
+ public int villagerItemRepickup = 100; // Gale - EMC - reduce villager item re-pickup
|
|
|
|
public CheckNearbyItem checkNearbyItem;
|
|
public class CheckNearbyItem extends ConfigurationPart {
|