mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-07 19:30:34 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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 Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 9feb8537560450fdcad63b1b2779325380c7a425 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Fri, 12 Oct 2018 01:37:16 -0500
|
|
Subject: [PATCH] Here's Johnny!
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Vindicator.java b/src/main/java/org/bukkit/entity/Vindicator.java
|
|
index b8ea68a8f..c5d9e76a6 100644
|
|
--- a/src/main/java/org/bukkit/entity/Vindicator.java
|
|
+++ b/src/main/java/org/bukkit/entity/Vindicator.java
|
|
@@ -3,4 +3,30 @@ package org.bukkit.entity;
|
|
/**
|
|
* Represents a Vindicator.
|
|
*/
|
|
-public interface Vindicator extends Illager { }
|
|
+public interface Vindicator extends Illager {
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Check if this Vindicator is set to Johnny mode.
|
|
+ * <p>
|
|
+ * When in Johnny mode the Vindicator will be hostile to any kind of mob, except
|
|
+ * for evokers, ghasts, illusioners and other vindicators. It will even be hostile
|
|
+ * to vexes. All mobs, except for endermites, phantoms, guardians, slimes and
|
|
+ * magma cubes, will try to attack the vindicator in return.
|
|
+ *
|
|
+ * @return True if in Johnny mode
|
|
+ */
|
|
+ boolean isJohnny();
|
|
+
|
|
+ /**
|
|
+ * Set this Vindicator's Johnny mode.
|
|
+ * <p>
|
|
+ * When in Johnny mode the Vindicator will be hostile to any kind of mob, except
|
|
+ * for evokers, ghasts, illusioners and other vindicators. It will even be hostile
|
|
+ * to vexes. All mobs, except for endermites, phantoms, guardians, slimes and
|
|
+ * magma cubes, will try to attack the vindicator in return.
|
|
+ *
|
|
+ * @param johnny True to enable Johnny mode
|
|
+ */
|
|
+ void setJohnny(boolean johnny);
|
|
+ // Paper end
|
|
+}
|
|
--
|
|
2.21.0
|
|
|