Updated Upstream (CraftBukkit/Spigot)
Doesn't compile yet. CraftBukkit Changes: 90d6905b Repackage NMS 69cf961d Repackage patches Spigot Changes: 79d53c28 Repackage NMS
This commit is contained in:
@@ -21,10 +21,22 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ fixCuringZombieVillagerDiscountExploit = getBoolean("game-mechanics.fix-curing-zombie-villager-discount-exploit", fixCuringZombieVillagerDiscountExploit);
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
|
||||
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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityVillager.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
|
||||
--- a/src/main/java/net/minecraft/world/entity/ai/gossip/Reputation.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/ai/gossip/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);
|
||||
}
|
||||
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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
|
||||
@@ -0,0 +0,0 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
||||
@Override
|
||||
public void a(ReputationEvent reputationevent, Entity entity) {
|
||||
@@ -41,15 +53,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user