Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 20:40:07 +01:00
64840b3018
Fix NPE when setting a player's spectator target
42 Zeilen
1.6 KiB
Diff
42 Zeilen
1.6 KiB
Diff
From 9720957b700b6ad50e7c1cdd7078098349190bc0 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 597878e2..4e59df89 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityVindicator.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityVindicator.java
|
|
@@ -4,7 +4,7 @@ import java.util.function.Predicate;
|
|
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 951d4792..5ff957ce 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.19.1
|
|
|