mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
62 lines
3.7 KiB
Diff
62 lines
3.7 KiB
Diff
From 8c66e5748d306678a0c33f2e4bf5eb7ed40f29c4 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Fri, 29 Nov 2019 20:33:41 -0600
|
|
Subject: [PATCH] Phantoms only attack insomniacs
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/EntityPhantom.java | 7 +++++--
|
|
src/main/java/net/minecraft/server/IEntitySelector.java | 1 +
|
|
src/main/java/net/pl3x/purpur/PurpurConfig.java | 2 ++
|
|
3 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
|
|
index ccc1ade4e4..af0828c28a 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
|
|
@@ -392,8 +392,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {
|
|
EntityHuman entityhuman = (EntityHuman) iterator.next();
|
|
|
|
if (EntityPhantom.this.a((EntityLiving) entityhuman, PathfinderTargetCondition.a)) {
|
|
- EntityPhantom.this.setGoalTarget(entityhuman, org.bukkit.event.entity.EntityTargetEvent.TargetReason.CLOSEST_PLAYER, true); // CraftBukkit - reason
|
|
- return true;
|
|
+ // Purpur start
|
|
+ if (!net.pl3x.purpur.PurpurConfig.phantomsOnlyAttackInsomniacs || IEntitySelector.isInsomniac.test(entityhuman)) {
|
|
+ return EntityPhantom.this.setGoalTarget(entityhuman, org.bukkit.event.entity.EntityTargetEvent.TargetReason.CLOSEST_PLAYER, true); // CraftBukkit - reason
|
|
+ }
|
|
+ // Purpur end
|
|
}
|
|
}
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
|
|
index 71c61dc45e..becf9d29e2 100644
|
|
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
|
|
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
|
|
@@ -25,6 +25,7 @@ public final class IEntitySelector {
|
|
return !entity.isSpectator();
|
|
};
|
|
public static Predicate<EntityHuman> notAfk = (player) -> !player.isAfk(); // Purpur
|
|
+ public static Predicate<EntityHuman> isInsomniac = (player) -> MathHelper.clamp(((EntityPlayer) player).getStatisticManager().getStatisticValue(StatisticList.CUSTOM.b(StatisticList.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= 72000; // Purpur
|
|
|
|
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
|
|
double d4 = d3 * d3;
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
index 37e9d13886..68db82759d 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
@@ -250,10 +250,12 @@ public class PurpurConfig {
|
|
public static double crystalsAttackPhantomsRadius = 0.0D;
|
|
public static float crystalsAttackPhantomDamage = 1.0F;
|
|
public static double phantomsOrbitCrystalsRadius = 0.0D;
|
|
+ public static boolean phantomsOnlyAttackInsomniacs = false;
|
|
private static void phantomSettings() {
|
|
crystalsAttackPhantomsRadius = getDouble("settings.mobs.phantom.crystals-attack-range", crystalsAttackPhantomsRadius);
|
|
crystalsAttackPhantomDamage = (float) getDouble("settings.mobs.phantom.crystals-attack-damage", crystalsAttackPhantomDamage);
|
|
phantomsOrbitCrystalsRadius = getDouble("settings.mobs.phantom.orbit-crystal-radius", phantomsOrbitCrystalsRadius);
|
|
+ phantomsOnlyAttackInsomniacs = getBoolean("settings.mobs.phantom.only-attack-insomniacs", phantomsOnlyAttackInsomniacs);
|
|
}
|
|
|
|
public static boolean pigmenDontTargetUnlessHit = false;
|
|
--
|
|
2.24.0.rc1
|
|
|