geforkt von Mirrors/Paper
2f782a6652
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
42 Zeilen
1.7 KiB
Diff
42 Zeilen
1.7 KiB
Diff
From d4b3955f50dda1a2db47ecc095895196f96b5dd7 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Fri, 12 Oct 2018 01:37:22 -0500
|
|
Subject: [PATCH] Here's Johnny!
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
|
|
index 54c1b7c878..130a2e4ffe 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityVindicator.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityVindicator.java
|
|
@@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract {
|
|
private static final Predicate<EnumDifficulty> b = (enumdifficulty) -> {
|
|
return enumdifficulty == EnumDifficulty.NORMAL || enumdifficulty == EnumDifficulty.HARD;
|
|
};
|
|
- private boolean bz;
|
|
+ private boolean bz; public boolean isJohnny() { return bz; } public void setJohnny(boolean johnny) { bz = johnny; } // Paper - OBFHELPER
|
|
|
|
public EntityVindicator(EntityTypes<? extends EntityVindicator> entitytypes, World world) {
|
|
super(entitytypes, world);
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
|
|
index 951d479298..5ff957ced7 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
|
|
@@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator {
|
|
public EntityType getType() {
|
|
return EntityType.VINDICATOR;
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ public boolean isJohnny() {
|
|
+ return getHandle().isJohnny();
|
|
+ }
|
|
+
|
|
+ public void setJohnny(boolean johnny) {
|
|
+ getHandle().setJohnny(johnny);
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.21.0
|
|
|