mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-06 15:51:31 +00:00
a7515a3918
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@9f004614 Update a whole lot of deprecated annotations PaperMC/Paper@72f13f8b [ci/skip] Mention API Checks for CONTRIBUTING.md (#12315) PaperMC/Paper@7cc6cb50 Check for trailing input in ItemFactory#createItemStack (#12312) PaperMC/Paper@f49d18df Add get/set customName to Skull block (#12302) PaperMC/Paper@894631f0 Make advancement ordering predictable (#12292) PaperMC/Paper@2aad131e Add config option for command spam whitelist PaperMC/Paper@bb3b7e69 Fix annotation mistakes PaperMC/Paper@058455e4 InventoryView QOL open method (#12282) PaperMC/Paper@f2258582 Fix firework entity not being removed when FireworkExplodeEvent is cancelled (#12268) PaperMC/Paper@7819df10 Add getHeight method to ChunkData (#12311) PaperMC/Paper@37b9ca1f Add flush parameter to World#save (#12330) PaperMC/Paper@515e12ca Check if BUNDLE_CONTENTS is present in InventoryClickEvent (#12321) PaperMC/Paper@5a6ab97b Add config to remove player as vehicle restriction in /ride (#12327) PaperMC/Paper@c467df95 Add ItemStack#copyDataFrom (#12224) Gale Changes: Dreeam-qwq/Gale@d5143ee0 Updated Upstream (Paper) Dreeam-qwq/Gale@63c396e7 Updated Upstream (Paper) Dreeam-qwq/Gale@5c2147b4 Updated Upstream (Paper) Dreeam-qwq/Gale@804ecea0 Rebuild patches
41 lines
1.9 KiB
Diff
41 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Taiyou06 <kaandindar21@gmail.com>
|
|
Date: Sat, 22 Mar 2025 11:22:23 +0100
|
|
Subject: [PATCH] Remove streams on updateConnectedPlayersWithinRange
|
|
|
|
|
|
diff --git a/net/minecraft/world/level/block/entity/vault/VaultSharedData.java b/net/minecraft/world/level/block/entity/vault/VaultSharedData.java
|
|
index 50d6ff126a35ce8613175b550dac50cd82c43f9d..8fc21228a77206387d341734e6fd9df1f641958d 100644
|
|
--- a/net/minecraft/world/level/block/entity/vault/VaultSharedData.java
|
|
+++ b/net/minecraft/world/level/block/entity/vault/VaultSharedData.java
|
|
@@ -3,6 +3,8 @@ package net.minecraft.world.level.block.entity.vault;
|
|
import com.mojang.serialization.Codec;
|
|
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
|
import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet;
|
|
+
|
|
+import java.util.List;
|
|
import java.util.Set;
|
|
import java.util.UUID;
|
|
import java.util.stream.Collectors;
|
|
@@ -65,11 +67,15 @@ public class VaultSharedData {
|
|
}
|
|
|
|
void updateConnectedPlayersWithinRange(ServerLevel level, BlockPos pos, VaultServerData serverData, VaultConfig config, double deactivationRange) {
|
|
- Set<UUID> set = config.playerDetector()
|
|
- .detect(level, config.entitySelector(), pos, deactivationRange, false)
|
|
- .stream()
|
|
- .filter(uuid -> !serverData.getRewardedPlayers().contains(uuid))
|
|
- .collect(Collectors.toSet());
|
|
+ List<UUID> detectedPlayers = config.playerDetector().detect(level, config.entitySelector(), pos, deactivationRange, false);
|
|
+ Set<UUID> set = new ObjectLinkedOpenHashSet<>();
|
|
+
|
|
+ for (UUID uuid : detectedPlayers) {
|
|
+ if (!serverData.getRewardedPlayers().contains(uuid)) {
|
|
+ set.add(uuid);
|
|
+ }
|
|
+ }
|
|
+
|
|
if (!this.connectedPlayers.equals(set)) {
|
|
this.connectedPlayers = set;
|
|
this.markDirty();
|