2021-06-11 14:02:28 +02:00
|
|
|
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
|
2021-06-16 08:25:38 +02:00
|
|
|
index e51c66ca0005ecb22ca99d33d2e37900eccf9c73..ba39026cc7ba904d6f9d8226fae01943544445e9 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2021-06-15 15:20:52 +02:00
|
|
|
@@ -79,6 +79,11 @@ public class PaperWorldConfig {
|
2021-06-11 14:02:28 +02:00
|
|
|
fixClimbingBypassingCrammingRule = getBoolean("fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule);
|
|
|
|
}
|
2021-06-14 20:50:22 +02:00
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public boolean fixCuringZombieVillagerDiscountExploit = true;
|
|
|
|
+ private void fixCuringExploit() {
|
|
|
|
+ fixCuringZombieVillagerDiscountExploit = getBoolean("game-mechanics.fix-curing-zombie-villager-discount-exploit", fixCuringZombieVillagerDiscountExploit);
|
|
|
|
+ }
|
2021-06-14 20:50:22 +02:00
|
|
|
+
|
|
|
|
public short keepLoadedRange;
|
|
|
|
private void keepLoadedRange() {
|
|
|
|
keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
2021-06-15 07:38:36 +02:00
|
|
|
index fe9ee43bf0c49c0541bc4fb114e63b8a0fcf1967..18b35c8d2160d24c31483edef13cc5e8d93ed09b 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
2021-06-14 20:50:22 +02:00
|
|
|
@@ -1056,6 +1056,15 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
2021-06-11 14:02:28 +02:00
|
|
|
@Override
|
|
|
|
public void onReputationEventFrom(ReputationEventType interaction, Entity entity) {
|
|
|
|
if (interaction == ReputationEventType.ZOMBIE_VILLAGER_CURED) {
|
|
|
|
+ // Paper start - fix MC-181190
|
|
|
|
+ if (level.paperConfig.fixCuringZombieVillagerDiscountExploit) {
|
|
|
|
+ final GossipContainer.EntityGossips playerReputation = this.getReputation().getReputations().get(entity.getUUID());
|
|
|
|
+ if (playerReputation != null) {
|
2021-06-14 20:50:22 +02:00
|
|
|
+ playerReputation.remove(GossipType.MAJOR_POSITIVE);
|
|
|
|
+ playerReputation.remove(GossipType.MINOR_POSITIVE);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
this.gossips.add(entity.getUUID(), GossipType.MAJOR_POSITIVE, 20);
|
|
|
|
this.gossips.add(entity.getUUID(), GossipType.MINOR_POSITIVE, 25);
|
|
|
|
} else if (interaction == ReputationEventType.TRADE) {
|