mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove streams from classes related to villager gossip (#3748)

Browse source
This commit is contained in:
Josh Roy 2020-07-04 21:31:58 -04:00 committed by GitHub
parent b49104db64
commit f3cd94c42b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 91 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
Spigot-Server-Patches/0531-Remove-streams-from-classes-related-villager-gossip.patch Normal file
View file

@ -0,0 +1,91 @@
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/server/Reputation.java b/src/main/java/net/minecraft/server/Reputation.java
index 28c9f9ed2d532a1eb14b74c2e9723a2cf1b3c6fa..b3a4ec25446878fce5961e9014d24a3009571438 100644
--- a/src/main/java/net/minecraft/server/Reputation.java
+++ b/src/main/java/net/minecraft/server/Reputation.java
@@ -49,8 +49,20 @@ public class Reputation {
});
}
+ // Paper start - Remove streams from reputation
+ private List<Reputation.b> decompress() {
+ List<Reputation.b> list = new it.unimi.dsi.fastutil.objects.ObjectArrayList<>();
+ for (Map.Entry<UUID, Reputation.a> entry : getReputations().entrySet()) {
+ for (Reputation.b cur : entry.getValue().decompress(entry.getKey())) {
+ list.add(cur);
+ }
+ }
+ return list;
+ }
+ // Paper end
+
private Collection<Reputation.b> a(Random random, int i) {
- List<Reputation.b> list = (List) this.c().collect(Collectors.toList());
+ List<Reputation.b> list = decompress(); // Paper - Remove streams from reputation
if (list.isEmpty()) {
return Collections.emptyList();
@@ -117,7 +129,7 @@ public class Reputation {
}
public <T> Dynamic<T> a(DynamicOps<T> dynamicops) {
- return new Dynamic(dynamicops, dynamicops.createList(this.c().map((reputation_b) -> {
+ return new Dynamic(dynamicops, dynamicops.createList(this.decompress().stream().map((reputation_b) -> {
return reputation_b.a(dynamicops);
}).map(Dynamic::getValue)));
}
@@ -142,18 +154,30 @@ public class Reputation {
public static class a { // Paper - make public
- private final Object2IntMap<ReputationType> a;
+ private final Object2IntMap<ReputationType> a; private Object2IntMap<ReputationType> getEntries() { return a; } // Paper - OBFHELPER
public a() { // Paper - make public - update CraftVillager setReputation on change
this.a = new Object2IntOpenHashMap();
}
public int a(Predicate<ReputationType> predicate) {
- return this.a.object2IntEntrySet().stream().filter((entry) -> {
- return predicate.test(entry.getKey());
- }).mapToInt((entry) -> {
- return entry.getIntValue() * ((ReputationType) entry.getKey()).g;
- }).sum();
+ // Paper start - Remove streams from reputation
+ int weight = 0;
+ for (Object2IntMap.Entry<ReputationType> entry : getEntries().object2IntEntrySet()) {
+ if (predicate.test(entry.getKey())) {
+ weight += entry.getIntValue() * entry.getKey().getWeight();
+ }
+ }
+ return weight;
+ }
+
+ public List<Reputation.b> decompress(UUID uuid) {
+ List<Reputation.b> list = new it.unimi.dsi.fastutil.objects.ObjectArrayList<>();
+ for (Object2IntMap.Entry<ReputationType> entry : getEntries().object2IntEntrySet()) {
+ list.add(new Reputation.b(uuid, entry.getKey(), entry.getIntValue()));
+ }
+ return list;
+ // Paper - end
}
public Stream<Reputation.b> a(UUID uuid) {
diff --git a/src/main/java/net/minecraft/server/ReputationType.java b/src/main/java/net/minecraft/server/ReputationType.java
index 23dfa1d13fe1e1e67bcae0d7556f4ea1cf3d090d..73ad45295efbdfb5bd37a7743e17f8f210d3efbf 100644
--- a/src/main/java/net/minecraft/server/ReputationType.java
+++ b/src/main/java/net/minecraft/server/ReputationType.java
@@ -11,7 +11,7 @@ public enum ReputationType {
MAJOR_NEGATIVE("major_negative", -5, 100, 10, 10), MINOR_NEGATIVE("minor_negative", -1, 200, 20, 20), MINOR_POSITIVE("minor_positive", 1, 200, 1, 5), MAJOR_POSITIVE("major_positive", 5, 100, 0, 100), TRADING("trading", 1, 25, 2, 20);
public final String f;
- public final int g;
+ public final int g; public int getWeight() { return g; } // Paper - OBFHELPER
public final int h;
public final int i;
public final int j;