diff options
Diffstat (limited to 'patches/server/0458-Remove-streams-from-classes-related-villager-gossip.patch')
-rw-r--r-- | patches/server/0458-Remove-streams-from-classes-related-villager-gossip.patch | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/patches/server/0458-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0458-Remove-streams-from-classes-related-villager-gossip.patch new file mode 100644 index 0000000000..91540dce15 --- /dev/null +++ b/patches/server/0458-Remove-streams-from-classes-related-villager-gossip.patch @@ -0,0 +1,83 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: JRoy <[email protected]> +Date: Wed, 1 Jul 2020 18:01:49 -0400 +Subject: [PATCH] Remove streams from classes related villager gossip + + +diff --git a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java +index 125d08fc4536f15604ef13636056c94f77b5df57..ea9c4bf7549f6a09bd5ac35f35686391a53838b2 100644 +--- a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java ++++ b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java +@@ -8,6 +8,7 @@ import com.mojang.serialization.Dynamic; + import com.mojang.serialization.DynamicOps; + import it.unimi.dsi.fastutil.objects.Object2IntMap; + import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; ++import it.unimi.dsi.fastutil.objects.ObjectArrayList; // Paper + import it.unimi.dsi.fastutil.objects.ObjectIterator; + import it.unimi.dsi.fastutil.objects.Object2IntMap.Entry; + import java.util.Arrays; +@@ -59,8 +60,21 @@ public class GossipContainer { + }); + } + ++ // Paper start - Remove streams from reputation ++ private List<GossipContainer.GossipEntry> decompress() { ++ List<GossipContainer.GossipEntry> list = new ObjectArrayList<>(); ++ for (Map.Entry<UUID, GossipContainer.EntityGossips> entry : getReputations().entrySet()) { ++ for (GossipContainer.GossipEntry cur : entry.getValue().decompress(entry.getKey())) { ++ if (cur.weightedValue() != 0) ++ list.add(cur); ++ } ++ } ++ return list; ++ } ++ // Paper end ++ + private Collection<GossipContainer.GossipEntry> selectGossipsForTransfer(Random random, int count) { +- List<GossipContainer.GossipEntry> list = this.unpack().collect(Collectors.toList()); ++ List<GossipContainer.GossipEntry> list = decompress(); // Paper - Remove streams from reputation + if (list.isEmpty()) { + return Collections.emptyList(); + } else { +@@ -153,9 +167,9 @@ public class GossipContainer { + + } + +- public <T> Dynamic<T> store(DynamicOps<T> dynamicOps) { +- return new Dynamic<>(dynamicOps, dynamicOps.createList(this.unpack().map((gossipEntry) -> { +- return gossipEntry.store(dynamicOps); ++ public <T> Dynamic<T> store(DynamicOps<T> dynamicops) { ++ return new Dynamic(dynamicops, dynamicops.createList(this.decompress().stream().map((reputation_b) -> { ++ return reputation_b.store(dynamicops); + }).map(Dynamic::getValue))); + } + +@@ -180,11 +194,23 @@ public class GossipContainer { + final Object2IntMap<GossipType> entries = new Object2IntOpenHashMap<>(); + + public int weightedValue(Predicate<GossipType> gossipTypeFilter) { +- return this.entries.object2IntEntrySet().stream().filter((entry) -> { +- return gossipTypeFilter.test(entry.getKey()); +- }).mapToInt((entry) -> { +- return entry.getIntValue() * (entry.getKey()).weight; +- }).sum(); ++ // Paper start - Remove streams from reputation ++ int weight = 0; ++ for (Object2IntMap.Entry<GossipType> entry : entries.object2IntEntrySet()) { ++ if (gossipTypeFilter.test(entry.getKey())) { ++ weight += entry.getIntValue() * entry.getKey().weight; ++ } ++ } ++ return weight; ++ } ++ ++ public List<GossipContainer.GossipEntry> decompress(UUID uuid) { ++ List<GossipContainer.GossipEntry> list = new ObjectArrayList<>(); ++ for (Object2IntMap.Entry<GossipType> entry : entries.object2IntEntrySet()) { ++ list.add(new GossipContainer.GossipEntry(uuid, entry.getKey(), entry.getIntValue())); ++ } ++ return list; ++ // Paper - end + } + + public Stream<GossipContainer.GossipEntry> unpack(UUID target) { |