geforkt von Mirrors/Paper
b68b282439
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 Warning: this commit contains more mapping changes from upstream, As always, ensure that you have working backups and test this build before deployment; Developers working on paper will, yet again, need to delete their work/Minecraft/1.13.2 folder Bukkit Changes: 7fca5fd4 SPIGOT-4558: Preserve user order in the face of copied defaults in configurations 15c9b1eb Ignore spurious slot IDs sent by client, e.g. in enchanting tables 5d2a10c5 SPIGOT-3747: Add API for force loaded chunks d6dd2bb3 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent 771db4aa SPIGOT-794: Call EntityPlaceEvent for Minecart placement 55462509 Add InventoryView#getSlotType 2f3ce5b6 Remove EntityTransformEvent and CustomItemTagContainer from draft API f04ad7b6 Make ProjectileLaunchEvent extend EntitySpawnEvent ccb85808 Define EntitySpawnEvent b8cc3ebe Add PlayerItemDamageEvent 184a495d Ease ClassLoader Deadlocks Where Possible 11ac4728 Expand Boolean Prompt Values in Conversation API aae62d51 Added getAllSessionData() to the Conversation API. 9290ff91 Add InventoryView#getInventory API 995e530f Add API to get / set base arrow damage CraftBukkit Changes:c4a67eed
SPIGOT-4556: Fix plugins closing inventory during drop events5be2ddcb
Replace version constants with methods to prevent compiler inlininga5b9c7b3
Use API method to create offset command completions2bc7d1df
SPIGOT-3747: Add API for force loaded chunksa408f375
SPIGOT-3538: Add getHitBlockFace for ProjectileHitEventb54b9409
SPIGOT-2864: Make Arrow / Item setTicksLived behave like FallingBlock79ded7a8
SPIGOT-1811: Death message not shown on respawn screenb4a4f15d
SPIGOT-943: InventoryCloseEvent called on death regardless of open inventory0afed592
SPIGOT-794: Call EntityPlaceEvent for Minecart placement2b2d084a
Add InventoryView#getSlotType01a9959a
Do not use deprecated ItemSpawnEvent constructor9642498d
SPIGOT-4547: Call EntitySpawnEvent as general spawn fallback event963f4a5f
Add PlayerItemDamageEvent63db0445
Add API to get / set base arrow damage531c25d7
Add CraftMagicNumbers.MAPPINGS_VERSION for use by NMS pluginsd05c8b14
Mappings Updatebd36e200
SPIGOT-4551: Ignore invalid attribute modifier slots Spigot Changes: 518206a1 Remove redundant trove depend 1959ad21 MC-11211,SPIGOT-4552: Fix placing double slabs at y = 255 29ab5e43 SPIGOT-3661: Allow arguments in restart-script 7cc46316 SPIGOT-852: Growth modifiers for beetroots, potatoes, carrots 82e117e1 Squelch "fatal: Resolve operation not in progress" message 0a1a68e7 Mappings Update & Patch Rebuild
270 Zeilen
6.6 KiB
Diff
270 Zeilen
6.6 KiB
Diff
From 853b766f604c2846ccace37753d58df97c8834b1 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Fri, 28 Sep 2018 17:08:09 -0500
|
|
Subject: [PATCH] Turtle API
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
|
|
new file mode 100644
|
|
index 00000000..11248ee9
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
|
|
@@ -0,0 +1,45 @@
|
|
+package com.destroystokyo.paper.event.entity;
|
|
+
|
|
+import org.bukkit.entity.Turtle;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+
|
|
+/**
|
|
+ * Fired when a Turtle decides to go home
|
|
+ */
|
|
+public class TurtleGoHomeEvent extends EntityEvent implements Cancellable {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean cancelled = false;
|
|
+
|
|
+ public TurtleGoHomeEvent(Turtle turtle) {
|
|
+ super(turtle);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The turtle going home
|
|
+ *
|
|
+ * @return The turtle
|
|
+ */
|
|
+ public Turtle getEntity() {
|
|
+ return (Turtle) entity;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
|
|
new file mode 100644
|
|
index 00000000..7cb00f78
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
|
|
@@ -0,0 +1,81 @@
|
|
+package com.destroystokyo.paper.event.entity;
|
|
+
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.entity.Turtle;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+
|
|
+/**
|
|
+ * Fired when a Turtle lays eggs
|
|
+ */
|
|
+public class TurtleLayEggEvent extends EntityEvent implements Cancellable {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean cancelled = false;
|
|
+ private final Location location;
|
|
+ private int eggCount;
|
|
+
|
|
+ public TurtleLayEggEvent(Turtle turtle, Location location, int eggCount) {
|
|
+ super(turtle);
|
|
+ this.location = location;
|
|
+ this.eggCount = eggCount;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The turtle laying the eggs
|
|
+ *
|
|
+ * @return The turtle
|
|
+ */
|
|
+ public Turtle getEntity() {
|
|
+ return (Turtle) entity;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the location where the eggs are being laid
|
|
+ *
|
|
+ * @return Location of eggs
|
|
+ */
|
|
+ public Location getLocation() {
|
|
+ return location;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the number of eggs being laid
|
|
+ *
|
|
+ * @return Number of eggs
|
|
+ */
|
|
+ public int getEggCount() {
|
|
+ return eggCount;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Set the number of eggs being laid
|
|
+ *
|
|
+ * @param eggCount Number of eggs
|
|
+ */
|
|
+ public void setEggCount(int eggCount) {
|
|
+ if (eggCount < 1) {
|
|
+ cancelled = true;
|
|
+ return;
|
|
+ }
|
|
+ eggCount = Math.min(eggCount, 4);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
|
|
new file mode 100644
|
|
index 00000000..5d53ee08
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
|
|
@@ -0,0 +1,57 @@
|
|
+package com.destroystokyo.paper.event.entity;
|
|
+
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.entity.Turtle;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+
|
|
+/**
|
|
+ * Fired when a Turtle starts digging to lay eggs
|
|
+ */
|
|
+public class TurtleStartDiggingEvent extends EntityEvent implements Cancellable {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean cancelled = false;
|
|
+ private final Location location;
|
|
+
|
|
+ public TurtleStartDiggingEvent(Turtle turtle, Location location) {
|
|
+ super(turtle);
|
|
+ this.location = location;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The turtle digging
|
|
+ *
|
|
+ * @return The turtle
|
|
+ */
|
|
+ public Turtle getEntity() {
|
|
+ return (Turtle) entity;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the location where the turtle is digging
|
|
+ *
|
|
+ * @return Location where digging
|
|
+ */
|
|
+ public Location getLocation() {
|
|
+ return location;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java
|
|
index 0a4cd299..e547eead 100644
|
|
--- a/src/main/java/org/bukkit/entity/Turtle.java
|
|
+++ b/src/main/java/org/bukkit/entity/Turtle.java
|
|
@@ -1,6 +1,53 @@
|
|
package org.bukkit.entity;
|
|
|
|
+import org.bukkit.Location;
|
|
+
|
|
/**
|
|
* Represents a turtle.
|
|
*/
|
|
-public interface Turtle extends Animals { }
|
|
+public interface Turtle extends Animals {
|
|
+ // Paper start
|
|
+
|
|
+ /**
|
|
+ * Get the turtle's home location
|
|
+ *
|
|
+ * @return Home location
|
|
+ */
|
|
+ Location getHome();
|
|
+
|
|
+ /**
|
|
+ * Set the turtle's home location
|
|
+ *
|
|
+ * @param location Home location
|
|
+ */
|
|
+ void setHome(Location location);
|
|
+
|
|
+ /**
|
|
+ * Check if turtle is currently pathfinding to it's home
|
|
+ *
|
|
+ * @return True if going home
|
|
+ */
|
|
+ boolean isGoingHome();
|
|
+
|
|
+ /**
|
|
+ * Get if turtle is digging to lay eggs
|
|
+ *
|
|
+ * @return True if digging
|
|
+ */
|
|
+ boolean isDigging();
|
|
+
|
|
+ /**
|
|
+ * Get if turtle is carrying egg
|
|
+ *
|
|
+ * @return True if carrying egg
|
|
+ */
|
|
+ boolean hasEgg();
|
|
+
|
|
+ /**
|
|
+ * Set if turtle is carrying egg
|
|
+ *
|
|
+ * @param hasEgg True if carrying egg
|
|
+ */
|
|
+ void setHasEgg(boolean hasEgg);
|
|
+ // Paper end
|
|
+}
|
|
--
|
|
2.20.1
|
|
|