mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2024-11-17 18:56:12 +00:00
39 lines
2.1 KiB
Diff
39 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Video <videogamesm12@gmail.com>
|
|
Date: Sat, 9 Apr 2022 13:00:27 -0600
|
|
Subject: [PATCH] Don't query player data in the `nbt` component
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java b/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java
|
|
index 8a6799b50062c1b7b141ee1568dc523f9ee7ecfd..80e7b0889235288b60d813a569daecb7e08e108e 100644
|
|
--- a/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java
|
|
+++ b/src/main/java/net/minecraft/network/chat/contents/EntityDataSource.java
|
|
@@ -1,5 +1,6 @@
|
|
package net.minecraft.network.chat.contents;
|
|
|
|
+import me.totalfreedom.scissors.ScissorsConfig; // Scissors
|
|
import com.mojang.brigadier.StringReader;
|
|
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
|
import java.util.List;
|
|
@@ -11,6 +12,7 @@ import net.minecraft.commands.arguments.selector.EntitySelector;
|
|
import net.minecraft.commands.arguments.selector.EntitySelectorParser;
|
|
import net.minecraft.nbt.CompoundTag;
|
|
import net.minecraft.world.entity.Entity;
|
|
+import net.minecraft.world.entity.player.Player; // Scissors
|
|
|
|
public record EntityDataSource(String selectorPattern, @Nullable EntitySelector compiledSelector) implements DataSource {
|
|
public EntityDataSource(String rawPath) {
|
|
@@ -31,7 +33,11 @@ public record EntityDataSource(String selectorPattern, @Nullable EntitySelector
|
|
public Stream<CompoundTag> getData(CommandSourceStack source) throws CommandSyntaxException {
|
|
if (this.compiledSelector != null) {
|
|
List<? extends Entity> list = this.compiledSelector.findEntities(source);
|
|
- return list.stream().map(NbtPredicate::getEntityTagToCompare);
|
|
+ // Scissors start
|
|
+ Stream<? extends Entity> stream = list.stream();
|
|
+ if (ScissorsConfig.excludePlayersFromNbtComponents) stream = stream.filter((entity) -> !(entity instanceof Player));
|
|
+ return stream.map(NbtPredicate::getEntityTagToCompare);
|
|
+ // Scissors end
|
|
} else {
|
|
return Stream.empty();
|
|
}
|