75 lines
4.6 KiB
Diff
75 lines
4.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
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
|
||
|
|
index cd248eb6be663e8be33f2c3c6b06b77b6d5753a4..46ac6d91422423f1e03b86d3efa3241f2599000d 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -625,4 +625,11 @@ public class PaperWorldConfig {
|
||
|
|
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/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
|
||
|
|
index e7facd849e3511c64b4ae44b34382f4a4985f2a4..8ce62148ebaeac9988e7c9d4b2f7ee57f58d883e 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
|
||
|
|
@@ -3,6 +3,9 @@ package net.minecraft.world.entity;
|
||
|
|
import com.google.common.base.Predicates;
|
||
|
|
import java.util.function.Predicate;
|
||
|
|
import javax.annotation.Nullable;
|
||
|
|
+import net.minecraft.server.level.ServerPlayer;
|
||
|
|
+import net.minecraft.stats.Stats;
|
||
|
|
+import net.minecraft.util.Mth;
|
||
|
|
import net.minecraft.world.Container;
|
||
|
|
import net.minecraft.world.Difficulty;
|
||
|
|
import net.minecraft.world.entity.player.Player;
|
||
|
|
@@ -31,10 +34,11 @@ public final class EntitySelector {
|
||
|
|
public static final Predicate<Entity> NO_SPECTATORS = (entity) -> {
|
||
|
|
return !entity.isSpectator();
|
||
|
|
};
|
||
|
|
+ public static Predicate<Player> isInsomniac = (player) -> Mth.clamp(((ServerPlayer) player).getStats().getValue(Stats.CUSTOM.get(Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= 72000; // Paper
|
||
|
|
|
||
|
|
// Paper start
|
||
|
|
public static final Predicate<Entity> affectsSpawning = (entity) -> {
|
||
|
|
- return !entity.isSpectator() && entity.isAlive() && (entity instanceof EntityPlayer) && ((EntityPlayer) entity).affectsSpawning;
|
||
|
|
+ return !entity.isSpectator() && entity.isAlive() && (entity instanceof ServerPlayer) && ((ServerPlayer) entity).affectsSpawning;
|
||
|
|
};
|
||
|
|
// Paper end
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
|
||
|
|
index e37137a2890330b92e05d6f76c46ffc99a527803..a40c23e824652cff59633b7c314e27ec9a515c07 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
|
||
|
|
@@ -262,6 +262,7 @@ public class Phantom extends FlyingMob implements Enemy {
|
||
|
|
Player entityhuman = (Player) iterator.next();
|
||
|
|
|
||
|
|
if (Phantom.this.canAttack((LivingEntity) entityhuman, TargetingConditions.DEFAULT)) {
|
||
|
|
+ if (!level.paperConfig.phantomOnlyAttackInsomniacs || EntitySelector.isInsomniac.test(entityhuman)) // Paper
|
||
|
|
Phantom.this.setGoalTarget(entityhuman, org.bukkit.event.entity.EntityTargetEvent.TargetReason.CLOSEST_PLAYER, true); // CraftBukkit - reason
|
||
|
|
return true;
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
|
||
|
|
index 42effcbd3ca7c38a4e8b1aa835543ad243112a33..79504dc3448402e73b09c4232b1fd0488872cf68 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
|
||
|
|
@@ -53,7 +53,7 @@ public class PhantomSpawner implements CustomSpawner {
|
||
|
|
while (iterator.hasNext()) {
|
||
|
|
Player entityhuman = (Player) iterator.next();
|
||
|
|
|
||
|
|
- if (!entityhuman.isSpectator()) {
|
||
|
|
+ if (!entityhuman.isSpectator() && (!world.paperConfig.phantomIgnoreCreative || !entityhuman.isCreative())) { // Paper
|
||
|
|
BlockPos blockposition = entityhuman.blockPosition();
|
||
|
|
|
||
|
|
if (!world.dimensionType().hasSkyLight() || blockposition.getY() >= world.getSeaLevel() && world.canSeeSky(blockposition)) {
|