2022-11-26 17:59:04 +01:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jan Villim <jan.villim@student.tuke.sk>
Date: Sat, 22 Jan 2022 17:56:19 +0100
Subject: [PATCH] Ability to control player's insomnia and phantoms
diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
2024-01-16 12:41:40 +01:00
index 93a41156a01a1638f3ef469b1518a07e7961f378..dbbce471c35849ea7d7ad07e9db9b7d8d85690df 100644
2022-11-26 17:59:04 +01:00
--- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
+++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
2023-12-06 17:21:56 +01:00
@@ -28,7 +28,18 @@ public final class EntitySelector {
2022-11-26 17:59:04 +01:00
return !entity.isSpectator();
};
public static final Predicate<Entity> CAN_BE_COLLIDED_WITH = EntitySelector.NO_SPECTATORS.and(Entity::canBeCollidedWith);
2023-06-08 22:56:13 +02:00
- public static Predicate<Player> IS_INSOMNIAC = (player) -> net.minecraft.util.Mth.clamp(((net.minecraft.server.level.ServerPlayer) player).getStats().getValue(net.minecraft.stats.Stats.CUSTOM.get(net.minecraft.stats.Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= 72000; // Paper
2024-01-16 12:41:40 +01:00
+ // Paper start - Ability to control player's insomnia and phantoms
2023-06-08 22:56:13 +02:00
+ public static Predicate<Player> IS_INSOMNIAC = (player) -> {
2022-11-26 17:59:04 +01:00
+ net.minecraft.server.level.ServerPlayer serverPlayer = (net.minecraft.server.level.ServerPlayer) player;
2023-06-08 22:56:13 +02:00
+ int playerInsomniaTicks = serverPlayer.level().paperConfig().entities.behavior.playerInsomniaStartTicks;
2022-11-26 17:59:04 +01:00
+
+ if (playerInsomniaTicks <= 0) {
+ return false;
+ }
+
+ return net.minecraft.util.Mth.clamp(serverPlayer.getStats().getValue(net.minecraft.stats.Stats.CUSTOM.get(net.minecraft.stats.Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= playerInsomniaTicks;
+ };
2024-01-16 12:41:40 +01:00
+ // Paper end - Ability to control player's insomnia and phantoms
2022-11-26 17:59:04 +01:00
private EntitySelector() {}
// Paper start
diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
2024-01-16 12:41:40 +01:00
index b1fc786970b5288a02cc3a46e3fe7784ac566c07..7d7d37334321c844958ce09e77547dd61dcba6c8 100644
2022-11-26 17:59:04 +01:00
--- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
+++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
2023-06-08 10:47:19 +02:00
@@ -33,13 +33,22 @@ public class PhantomSpawner implements CustomSpawner {
2022-11-26 17:59:04 +01:00
} else if (!world.getGameRules().getBoolean(GameRules.RULE_DOINSOMNIA)) {
return 0;
} else {
2024-01-16 12:41:40 +01:00
+ // Paper start - Ability to control player's insomnia and phantoms
2022-11-26 17:59:04 +01:00
+ if (world.paperConfig().entities.behavior.phantomsSpawnAttemptMaxSeconds <= 0) {
+ return 0;
+ }
2024-01-16 12:41:40 +01:00
+ // Paper end - Ability to control player's insomnia and phantoms
2022-11-26 17:59:04 +01:00
RandomSource randomsource = world.random;
--this.nextTick;
if (this.nextTick > 0) {
return 0;
} else {
- this.nextTick += (60 + randomsource.nextInt(60)) * 20;
2024-01-16 12:41:40 +01:00
+ // Paper start - Ability to control player's insomnia and phantoms
2022-11-26 17:59:04 +01:00
+ int spawnAttemptMinSeconds = world.paperConfig().entities.behavior.phantomsSpawnAttemptMinSeconds;
+ int spawnAttemptMaxSeconds = world.paperConfig().entities.behavior.phantomsSpawnAttemptMaxSeconds;
+ this.nextTick += (spawnAttemptMinSeconds + randomsource.nextInt(spawnAttemptMaxSeconds - spawnAttemptMinSeconds + 1)) * 20;
2024-01-16 12:41:40 +01:00
+ // Paper end - Ability to control player's insomnia and phantoms
2022-11-26 17:59:04 +01:00
if (world.getSkyDarken() < 5 && world.dimensionType().hasSkyLight()) {
return 0;
} else {
2023-06-08 10:47:19 +02:00
@@ -60,7 +69,7 @@ public class PhantomSpawner implements CustomSpawner {
2023-03-14 22:29:14 +01:00
int j = Mth.clamp(serverstatisticmanager.getValue(Stats.CUSTOM.get(Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE);
2022-11-26 17:59:04 +01:00
boolean flag2 = true;
- if (randomsource.nextInt(j) >= 72000) {
2024-01-16 12:41:40 +01:00
+ if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper - Ability to control player's insomnia and phantoms
2022-11-26 17:59:04 +01:00
BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21));
BlockState iblockdata = world.getBlockState(blockposition1);
FluidState fluid = world.getFluidState(blockposition1);