Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix cured villager reputation not clearing

Browse Source
This commit is contained in:
William Blake Galbreath
2020-08-10 15:16:11 -05:00
parent 211646785d
commit e6150857db
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
patches/server/0125-Add-option-to-reset-reputation-when-villager-is-cure.patch
View File

@@ -5,29 +5,26 @@ Subject: [PATCH] Add option to reset reputation when villager is cured
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index ac81b6ec71..8c9fe69f7b 100644
index ac81b6ec71..a7e76f196f 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -39,7 +39,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@Nullable
private EntityHuman bC;
private byte bE;
- private final Reputation bF;
+ private Reputation bF; // Purpur - remove final
private long bG;
private long bH;
private int bI;
@@ -963,6 +963,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@Override
public void a(ReputationEvent reputationevent, Entity entity) {
if (reputationevent == ReputationEvent.a) {
+ if (world.purpurConfig.zombieVillagerResetReputationsWhenCured) this.getReputation().clear(); // Purpur
+ if (world.purpurConfig.zombieVillagerResetReputationsWhenCured) this.bF = new Reputation(); // Purpur
this.bF.a(entity.getUniqueID(), ReputationType.MAJOR_POSITIVE, 20);
this.bF.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 dffac0dc85..86bececa5f 100644
--- a/src/main/java/net/minecraft/server/Reputation.java
+++ b/src/main/java/net/minecraft/server/Reputation.java
@@ -29,6 +29,7 @@ public class Reputation {
public Reputation() {}
+ public void clear() { b(); } // Purpur - OBFHELPER
public void b() {
Iterator iterator = this.a.values().iterator();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9945c25a2e..d2332b00b9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java