mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-15 16:15:25 +02:00
ea855e2b46
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 Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes:d3ed1516Fix dangerously threaded beacons217a293dDon't relocate joptsimple to allow --help to work.1be05a21Prepare for imminent Java 12 releasea49270b2Mappings Update5259d80cSPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From 6230a02a2c1701e0d533b11d90147b2b08d9b968 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 96d0651e9..4bbb4817b 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityVindicator.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityVindicator.java
|
|
@@ -5,7 +5,7 @@ import javax.annotation.Nullable;
|
|
|
|
public class EntityVindicator extends EntityIllagerAbstract {
|
|
|
|
- private boolean b;
|
|
+ private boolean b; public boolean isJohnny() { return b; } public void setJohnny(boolean johnny) { b = johnny; } // Paper - OBFHELPER
|
|
private static final Predicate<Entity> c = (entity) -> {
|
|
return entity instanceof EntityLiving && ((EntityLiving) entity).df();
|
|
};
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
|
|
index 951d47929..5ff957ced 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
|
|
|