1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-16 18:31:53 +01:00

Improve zombie villager curing exploit fix ()

Instead of completely resetting a Villager's reputation for all players each time they are cured, we now only reset the relevant part of the reputation for only that player. This means the exploit is fixed and players cannot stack multiple cures until prices are down to 1, but doesn't have the same side effects that are commonly complained about with the current exploit fix.
This commit is contained in:
Jason Penilla 2021-01-15 09:40:10 -08:00
parent 7d3b9c9bc0
commit 9db95fbc63

View file

@ -4,8 +4,8 @@ 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 reputation when it
is cured.
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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
@ -25,20 +25,31 @@ diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/j
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -0,0 +0,0 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@Nullable
private EntityHuman bv;
private byte bx;
- private final Reputation by;
+ private Reputation by; private void resetReputation() { this.by = new Reputation(); } // Paper - OBFHELPER
private long bz;
private long bA;
private int bB;
@@ -0,0 +0,0 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@Override
public void a(ReputationEvent reputationevent, Entity entity) {
if (reputationevent == ReputationEvent.a) {
+ if (world.paperConfig.fixCuringZombieVillagerDiscountExploit) this.resetReputation(); // Paper - fix MC-181190
+ // 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) {
diff --git a/src/main/java/net/minecraft/server/Reputation.java b/src/main/java/net/minecraft/server/Reputation.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/Reputation.java
+++ b/src/main/java/net/minecraft/server/Reputation.java
@@ -0,0 +0,0 @@ public class Reputation {
}
+ public final void removeReputationForType(ReputationType reputationType) { this.b(reputationType); } // Paper - OBFHELPER
public void b(ReputationType reputationtype) {
this.a.removeInt(reputationtype);
}