mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-04 15:41:40 +00:00
387597f347
Upstream has released updates that appear to apply and compile correctly Leaves Changes: LeavesMC/Leaves@88819fe8 Add mc-old hopper suck-in behavior (#395) LeavesMC/Leaves@7394e8dd Fix papermc repo LeavesMC/Leaves@85c7bf11 Remove cache-world-generator-sea-level (#392) LeavesMC/Leaves@00798036 init 1.21.4, and boom! LeavesMC/Leaves@91fc24da build change, but weight not work LeavesMC/Leaves@4ccdf459 just work LeavesMC/Leaves@05ee2e36 Build changes, and delete timings LeavesMC/Leaves@fcc859dc Fix API patches (#406) LeavesMC/Leaves@6a1259df 0006/0129 LeavesMC/Leaves@3e3b05df 0009/0129 LeavesMC/Leaves@c3255c4f 0011/0129 LeavesMC/Leaves@6284c7b6 0018/0129 LeavesMC/Leaves@7abdc88c 0030/0129 LeavesMC/Leaves@4d119ff9 0035/0129 LeavesMC/Leaves@60baed99 0043/0129 LeavesMC/Leaves@dc319d5b 0048/0129 LeavesMC/Leaves@73a505d5 0049/0129 LeavesMC/Leaves@016b29dd 0057/0129 LeavesMC/Leaves@c9cf5af8 0065/0129 LeavesMC/Leaves@330b79ff 0086/0129 (#408) LeavesMC/Leaves@06c1d946 0087/0129 LeavesMC/Leaves@bf4bc284 0091/0129 LeavesMC/Leaves@102a3b70 0097/0129 LeavesMC/Leaves@53b43fed 0101/0129 LeavesMC/Leaves@892f3925 102/129 LeavesMC/Leaves@08c3043a 0107/0129 LeavesMC/Leaves@48764d8e 0112/0129 LeavesMC/Leaves@8380feff 0118/0129 LeavesMC/Leaves@e51603db 0129/0129, 100% patched LeavesMC/Leaves@ef851152 fix some LeavesMC/Leaves@9b7c6e88 server work LeavesMC/Leaves@272b7dcb Protocol... (#409) LeavesMC/Leaves@7be1bc97 Make jade better LeavesMC/Leaves@5350f6ea Make action work LeavesMC/Leaves@f07c26c8 fix action jar
82 lines
3.8 KiB
Diff
82 lines
3.8 KiB
Diff
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] Remove stream in trial spawner ticking
|
|
|
|
|
|
diff --git a/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java b/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java
|
|
index 3e8d0c8d8409b6ba2e2846d7d64cdcc8fc6094a4..2f8324ce552f982f6b3388d9fa5a63fb9bee625b 100644
|
|
--- a/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java
|
|
+++ b/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerState.java
|
|
@@ -173,17 +173,21 @@ public enum TrialSpawnerState implements StringRepresentable {
|
|
}
|
|
|
|
private static Optional<Vec3> calculatePositionToSpawnSpawner(ServerLevel level, BlockPos pos, TrialSpawner spawner, TrialSpawnerData spawnerData) {
|
|
- List<Player> list = spawnerData.detectedPlayers
|
|
- .stream()
|
|
- .map(level::getPlayerByUUID)
|
|
- .filter(Objects::nonNull)
|
|
- .filter(
|
|
- player -> !player.isCreative()
|
|
- && !player.isSpectator()
|
|
- && player.isAlive()
|
|
- && player.distanceToSqr(pos.getCenter()) <= Mth.square(spawner.getRequiredPlayerRange())
|
|
- )
|
|
- .toList();
|
|
+ // Leaf start - Remove stream in trial spawner ticking
|
|
+ List<Player> list = new java.util.ArrayList<>();
|
|
+
|
|
+ for (UUID uuid : spawnerData.detectedPlayers) {
|
|
+ Player player = level.getPlayerByUUID(uuid);
|
|
+
|
|
+ if (player != null
|
|
+ && !player.isCreative()
|
|
+ && !player.isSpectator()
|
|
+ && player.isAlive()
|
|
+ && player.distanceToSqr(pos.getCenter()) <= Mth.square(spawner.getRequiredPlayerRange())) {
|
|
+ list.add(player);
|
|
+ }
|
|
+ }
|
|
+ // Leaf end - Remove stream in trial spawner ticking
|
|
if (list.isEmpty()) {
|
|
return Optional.empty();
|
|
} else {
|
|
@@ -203,16 +207,29 @@ public enum TrialSpawnerState implements StringRepresentable {
|
|
|
|
@Nullable
|
|
private static Entity selectEntityToSpawnItemAbove(List<Player> player, Set<UUID> currentMobs, TrialSpawner spawner, BlockPos pos, ServerLevel level) {
|
|
- Stream<Entity> stream = currentMobs.stream()
|
|
- .map(level::getEntity)
|
|
- .filter(Objects::nonNull)
|
|
- .filter(entity -> entity.isAlive() && entity.distanceToSqr(pos.getCenter()) <= Mth.square(spawner.getRequiredPlayerRange()));
|
|
- List<? extends Entity> list = level.random.nextBoolean() ? stream.toList() : player;
|
|
- if (list.isEmpty()) {
|
|
- return null;
|
|
+ // Leaf start - Remove stream in trial spawner ticking
|
|
+ if (level.random.nextBoolean()) {
|
|
+ List<Entity> list = new java.util.ArrayList<>();
|
|
+ for (UUID uuid : currentMobs) {
|
|
+ Entity entity = level.getEntity(uuid);
|
|
+ if (entity != null && entity.isAlive() && entity.distanceToSqr(pos.getCenter()) <= Mth.square(spawner.getRequiredPlayerRange())) {
|
|
+ list.add(entity);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (list.isEmpty()) {
|
|
+ return null;
|
|
+ } else {
|
|
+ return list.size() == 1 ? list.getFirst() : Util.getRandom(list, level.random);
|
|
+ }
|
|
} else {
|
|
- return list.size() == 1 ? list.getFirst() : Util.getRandom(list, level.random);
|
|
+ if (player.isEmpty()) {
|
|
+ return null;
|
|
+ } else {
|
|
+ return player.size() == 1 ? player.getFirst() : Util.getRandom(player, level.random);
|
|
+ }
|
|
}
|
|
+ // Leaf end - Remove stream in trial spawner ticking
|
|
}
|
|
|
|
private boolean timeToSpawnItemSpawner(ServerLevel level, TrialSpawnerData spawnerData) {
|