56 lines
3.3 KiB
Diff
56 lines
3.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: BillyGalbreath <blake.galbreath@gmail.com>
|
||
|
|
Date: Tue, 8 Dec 2020 20:14:20 -0600
|
||
|
|
Subject: [PATCH] Fix curing zombie villager discount exploit
|
||
|
|
|
||
|
|
This fixes the exploit used to gain absurd trading discounts with infecting
|
||
|
|
and curing a villager on repeat by simply resetting the relevant part of
|
||
|
|
the reputation when it is cured.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index 7d3207a9af8360ddad228281d6aa65e1a0d24157..a3b3e3e04b7a5e3a351992e06870cc91fbd8adc8 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -717,4 +717,9 @@ public class PaperWorldConfig {
|
||
|
|
private void fixClimbingBypassingCrammingRule() {
|
||
|
|
fixClimbingBypassingCrammingRule = getBoolean("fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public boolean fixCuringZombieVillagerDiscountExploit = true;
|
||
|
|
+ private void fixCuringExploit() {
|
||
|
|
+ fixCuringZombieVillagerDiscountExploit = getBoolean("game-mechanics.fix-curing-zombie-villager-discount-exploit", fixCuringZombieVillagerDiscountExploit);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/gossip/Reputation.java b/src/main/java/net/minecraft/world/entity/ai/gossip/Reputation.java
|
||
|
|
index 7d34d1157786227ac210edc1595a024ccb61a3e9..ce8a4cc9f642a740947c4e63d6eb78ad93a0fd44 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/gossip/Reputation.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/gossip/Reputation.java
|
||
|
|
@@ -223,6 +223,7 @@ public class Reputation {
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public final void removeReputationForType(ReputationType reputationType) { this.b(reputationType); } // Paper - OBFHELPER
|
||
|
|
public void b(ReputationType reputationtype) {
|
||
|
|
this.a.removeInt(reputationtype);
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
|
||
|
|
index d1ddb12e8bd83d2218165340fe323c6be7bc83dd..c29f05b6fd0664345d8d09f898777a3e44f866c4 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
|
||
|
|
@@ -1014,6 +1014,15 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||
|
|
@Override
|
||
|
|
public void a(ReputationEvent reputationevent, Entity entity) {
|
||
|
|
if (reputationevent == ReputationEvent.a) {
|
||
|
|
+ // Paper start - fix MC-181190
|
||
|
|
+ if (world.paperConfig.fixCuringZombieVillagerDiscountExploit) {
|
||
|
|
+ final Reputation.a playerReputation = this.getReputation().getReputations().get(entity.getUniqueID());
|
||
|
|
+ if (playerReputation != null) {
|
||
|
|
+ playerReputation.removeReputationForType(ReputationType.MAJOR_POSITIVE);
|
||
|
|
+ playerReputation.removeReputationForType(ReputationType.MINOR_POSITIVE);
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
this.by.a(entity.getUniqueID(), ReputationType.MAJOR_POSITIVE, 20);
|
||
|
|
this.by.a(entity.getUniqueID(), ReputationType.MINOR_POSITIVE, 25);
|
||
|
|
} else if (reputationevent == ReputationEvent.e) {
|