2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2020-04-25 22:33:18 +02:00
|
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
|
|
Date: Sat, 25 Apr 2020 15:13:41 -0500
|
|
|
|
Subject: [PATCH] Add phantom creative and insomniac controls
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2020-10-16 23:08:33 +02:00
|
|
|
index 0a8d127460730e7817f0f64509b9a9732096550b..a6dcc3606dd1f8aa963d4f09cad93d918d555339 100644
|
2020-04-25 22:33:18 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2020-10-16 23:08:33 +02:00
|
|
|
@@ -613,4 +613,11 @@ public class PaperWorldConfig {
|
2020-04-25 22:33:18 +02:00
|
|
|
private void lightQueueSize() {
|
|
|
|
lightQueueSize = getInt("light-queue-size", lightQueueSize);
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public boolean phantomIgnoreCreative = true;
|
|
|
|
+ public boolean phantomOnlyAttackInsomniacs = true;
|
|
|
|
+ private void phantomSettings() {
|
|
|
|
+ phantomIgnoreCreative = getBoolean("phantoms-do-not-spawn-on-creative-players", phantomIgnoreCreative);
|
|
|
|
+ phantomOnlyAttackInsomniacs = getBoolean("phantoms-only-attack-insomniacs", phantomOnlyAttackInsomniacs);
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
|
2020-09-11 01:47:58 +02:00
|
|
|
index 1afcf17a8ca4eb17125e2a9d066c5a15a3818417..3a70900c73e3a6c4f40cf74406534f4bfd3eb67b 100644
|
2020-04-25 22:33:18 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
|
2020-06-26 03:53:21 +02:00
|
|
|
@@ -225,6 +225,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
|
2020-04-25 22:33:18 +02:00
|
|
|
EntityHuman entityhuman = (EntityHuman) iterator.next();
|
|
|
|
|
|
|
|
if (EntityPhantom.this.a((EntityLiving) entityhuman, PathfinderTargetCondition.a)) {
|
|
|
|
+ if (!world.paperConfig.phantomOnlyAttackInsomniacs || IEntitySelector.isInsomniac.test(entityhuman)) // Paper
|
|
|
|
EntityPhantom.this.setGoalTarget(entityhuman, org.bukkit.event.entity.EntityTargetEvent.TargetReason.CLOSEST_PLAYER, true); // CraftBukkit - reason
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
|
2020-08-31 14:30:51 +02:00
|
|
|
index 7ba071a5cc14ef89dc005f4b9cebdc4cdef52532..a9b0c78d6dba8c6ff7d524e2828f0ee7832e059e 100644
|
2020-04-25 22:33:18 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
|
2020-08-25 20:46:04 +02:00
|
|
|
@@ -25,6 +25,7 @@ public final class IEntitySelector {
|
2020-06-26 03:53:21 +02:00
|
|
|
public static final Predicate<Entity> g = (entity) -> {
|
2020-04-25 22:33:18 +02:00
|
|
|
return !entity.isSpectator();
|
|
|
|
};
|
|
|
|
+ public static Predicate<EntityHuman> isInsomniac = (player) -> MathHelper.clamp(((EntityPlayer) player).getStatisticManager().getStatisticValue(StatisticList.CUSTOM.get(StatisticList.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= 72000; // Paper
|
|
|
|
|
2020-06-26 03:53:21 +02:00
|
|
|
// Paper start
|
|
|
|
public static final Predicate<Entity> affectsSpawning = (entity) -> {
|
2020-04-25 22:33:18 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
|
2020-08-25 04:22:08 +02:00
|
|
|
index 2e3d8d78c7a2b6c9a76c3446f8532137c537c79c..4e3f01bc79b6ed2a322155f29f1d0dcf298c8b82 100644
|
2020-04-25 22:33:18 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
|
2020-06-26 03:53:21 +02:00
|
|
|
@@ -32,7 +32,7 @@ public class MobSpawnerPhantom implements MobSpawner {
|
2020-04-25 22:33:18 +02:00
|
|
|
while (iterator.hasNext()) {
|
|
|
|
EntityHuman entityhuman = (EntityHuman) iterator.next();
|
|
|
|
|
|
|
|
- if (!entityhuman.isSpectator()) {
|
|
|
|
+ if (!entityhuman.isSpectator() && (!worldserver.paperConfig.phantomIgnoreCreative || !entityhuman.isCreative())) { // Paper
|
2020-06-26 03:53:21 +02:00
|
|
|
BlockPosition blockposition = entityhuman.getChunkCoordinates();
|
2020-04-25 22:33:18 +02:00
|
|
|
|
2020-08-25 04:22:08 +02:00
|
|
|
if (!worldserver.getDimensionManager().hasSkyLight() || blockposition.getY() >= worldserver.getSeaLevel() && worldserver.e(blockposition)) {
|