Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-04 15:41:40 +00:00
Code Issues Releases Activity

Added optimized trial spawner ticking

Browse Source
This commit is contained in:
Dreeam
2024-10-20 14:02:48 -04:00
parent fb95f9ed07
commit f6a7007600
1 changed files with 82 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
patches/server/0112-Optimize-trial-spawner-ticking.patch Normal file
View File

@@ -0,0 +1,82 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Sat, 5 Oct 2024 15:39:15 -0400
Subject: [PATCH] Optimize trial spawner ticking
diff --git a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java
index 005aea8a747e9cbbc352b8b57c64b84ec71ad321..a66e0b303aac2952c06f1ec704df0edc27d85409 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java
@@ -173,17 +173,22 @@ public enum TrialSpawnerState implements StringRepresentable {
}
private static Optional<Vec3> calculatePositionToSpawnSpawner(ServerLevel world, BlockPos pos, TrialSpawner logic, TrialSpawnerData data) {
- List<Player> list = data.detectedPlayers
- .stream()
- .map(world::getPlayerByUUID)
- .filter(Objects::nonNull)
- .filter(
- player -> !player.isCreative()
- && !player.isSpectator()
- && player.isAlive()
- && player.distanceToSqr(pos.getCenter()) <= (double)Mth.square(logic.getRequiredPlayerRange())
- )
- .toList();
+ // Leaf start - Optimize trial spawner ticking
+ List<Player> list = new java.util.ArrayList<>();
+
+ for (UUID uuid : data.detectedPlayers) {
+ Player player = world.getPlayerByUUID(uuid);
+
+ if (player != null
+ && !player.isCreative()
+ && !player.isSpectator()
+ && player.isAlive()
+ && player.distanceToSqr(pos.getCenter()) <= (double) Mth.square(logic.getRequiredPlayerRange())) {
+ list.add(player);
+ }
+ }
+ // Leaf end - Optimize trial spawner ticking
+
if (list.isEmpty()) {
return Optional.empty();
} else {
@@ -203,16 +208,29 @@ public enum TrialSpawnerState implements StringRepresentable {
@Nullable
private static Entity selectEntityToSpawnItemAbove(List<Player> players, Set<UUID> entityUuids, TrialSpawner logic, BlockPos pos, ServerLevel world) {
- Stream<Entity> stream = entityUuids.stream()
- .map(world::getEntity)
- .filter(Objects::nonNull)
- .filter(entity -> entity.isAlive() && entity.distanceToSqr(pos.getCenter()) <= (double)Mth.square(logic.getRequiredPlayerRange()));
- List<? extends Entity> list = world.random.nextBoolean() ? stream.toList() : players;
- if (list.isEmpty()) {
- return null;
+ // Leaf start - Optimize trial spawner ticking
+ if (world.random.nextBoolean()) {
+ List<Entity> list = new java.util.ArrayList<>();
+ for (UUID uuid : entityUuids) {
+ Entity entity = world.getEntity(uuid);
+ if (entity != null && entity.isAlive() && entity.distanceToSqr(pos.getCenter()) <= (double) Mth.square(logic.getRequiredPlayerRange())) {
+ list.add(entity);
+ }
+ }
+
+ if (list.isEmpty()) {
+ return null;
+ } else {
+ return list.size() == 1 ? list.getFirst() : Util.getRandom(list, world.random);
+ }
} else {
- return list.size() == 1 ? list.getFirst() : Util.getRandom(list, world.random);
+ if (players.isEmpty()) {
+ return null;
+ } else {
+ return players.size() == 1 ? players.getFirst() : Util.getRandom(players, world.random);
+ }
}
+ // Leaf end - Optimize trial spawner ticking
}
private boolean timeToSpawnItemSpawner(ServerLevel world, TrialSpawnerData data) {