Paper/patches/server/0458-Remove-streams-from-classes-related-villager-gossip.patch

84 lines
3.9 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: JRoy <joshroy126@gmail.com>
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
2022-05-29 21:54:25 +02:00
index e98951ac056910340c498d866715e174d461f723..8d879cc6f8b96c7521d4b55fcf1f3abb9e669ecd 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
+++ b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
2021-06-14 11:46:59 +02:00
@@ -8,6 +8,7 @@ import com.mojang.serialization.Dynamic;
import com.mojang.serialization.DynamicOps;
2021-06-11 14:02:28 +02:00
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 java.util.Arrays;
2022-05-29 21:54:25 +02:00
import java.util.Collection;
@@ -58,8 +59,21 @@ public class GossipContainer {
2021-06-11 14:02:28 +02:00
});
}
+ // 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) {
2021-06-14 11:46:59 +02:00
- List<GossipContainer.GossipEntry> list = this.unpack().collect(Collectors.toList());
2021-06-11 14:02:28 +02:00
+ List<GossipContainer.GossipEntry> list = decompress(); // Paper - Remove streams from reputation
if (list.isEmpty()) {
return Collections.emptyList();
2021-06-14 11:46:59 +02:00
} else {
2022-05-29 21:54:25 +02:00
@@ -152,9 +166,9 @@ public class GossipContainer {
2021-06-14 11:46:59 +02:00
2021-06-11 14:02:28 +02:00
}
2021-06-14 11:46:59 +02:00
- 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) {
2021-06-11 14:02:28 +02:00
+ return new Dynamic(dynamicops, dynamicops.createList(this.decompress().stream().map((reputation_b) -> {
2021-06-14 11:46:59 +02:00
+ return reputation_b.store(dynamicops);
2021-06-11 14:02:28 +02:00
}).map(Dynamic::getValue)));
}
2022-05-29 21:54:25 +02:00
@@ -179,11 +193,23 @@ public class GossipContainer {
2021-06-14 11:46:59 +02:00
final Object2IntMap<GossipType> entries = new Object2IntOpenHashMap<>();
2021-06-11 14:02:28 +02:00
public int weightedValue(Predicate<GossipType> gossipTypeFilter) {
- return this.entries.object2IntEntrySet().stream().filter((entry) -> {
- return gossipTypeFilter.test(entry.getKey());
- }).mapToInt((entry) -> {
2021-06-14 11:46:59 +02:00
- return entry.getIntValue() * (entry.getKey()).weight;
2021-06-11 14:02:28 +02:00
- }).sum();
+ // Paper start - Remove streams from reputation
+ int weight = 0;
2021-06-14 11:46:59 +02:00
+ for (Object2IntMap.Entry<GossipType> entry : entries.object2IntEntrySet()) {
2021-06-11 14:02:28 +02:00
+ if (gossipTypeFilter.test(entry.getKey())) {
2021-06-16 19:48:25 +02:00
+ weight += entry.getIntValue() * entry.getKey().weight;
2021-06-11 14:02:28 +02:00
+ }
+ }
+ return weight;
+ }
+
+ public List<GossipContainer.GossipEntry> decompress(UUID uuid) {
+ List<GossipContainer.GossipEntry> list = new ObjectArrayList<>();
2021-06-14 11:46:59 +02:00
+ for (Object2IntMap.Entry<GossipType> entry : entries.object2IntEntrySet()) {
2021-06-11 14:02:28 +02:00
+ list.add(new GossipContainer.GossipEntry(uuid, entry.getKey(), entry.getIntValue()));
+ }
+ return list;
+ // Paper - end
}
public Stream<GossipContainer.GossipEntry> unpack(UUID target) {