928bcc8d3a
Upstream has released updates that appear 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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
110 Zeilen
3.0 KiB
Diff
110 Zeilen
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: JRoy <joshroy126@gmail.com>
|
|
Date: Wed, 7 Oct 2020 12:04:17 -0400
|
|
Subject: [PATCH] Add EntityLoadCrossbowEvent
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/entity/EntityLoadCrossbowEvent.java b/src/main/java/io/papermc/paper/event/entity/EntityLoadCrossbowEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..aa9ccd7c806e864455ecd5f15ddb17c0fa8728c4
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/EntityLoadCrossbowEvent.java
|
|
@@ -0,0 +1,97 @@
|
|
+package io.papermc.paper.event.entity;
|
|
+
|
|
+import org.bukkit.entity.LivingEntity;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+import org.bukkit.inventory.EquipmentSlot;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+/**
|
|
+ * Called when a LivingEntity loads a crossbow with a projectile.
|
|
+ */
|
|
+public class EntityLoadCrossbowEvent extends EntityEvent implements Cancellable {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private final ItemStack crossbow;
|
|
+ private final EquipmentSlot hand;
|
|
+ private boolean cancelled;
|
|
+ private boolean consumeItem = true;
|
|
+
|
|
+ public EntityLoadCrossbowEvent(@NotNull LivingEntity entity, @Nullable ItemStack crossbow, @NotNull EquipmentSlot hand) {
|
|
+ super(entity);
|
|
+ this.crossbow = crossbow;
|
|
+ this.hand = hand;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public LivingEntity getEntity() {
|
|
+ return (LivingEntity) entity;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the crossbow {@link ItemStack} being loaded.
|
|
+ *
|
|
+ * @return the crossbow involved in this event
|
|
+ */
|
|
+ @Nullable
|
|
+ public ItemStack getCrossbow() {
|
|
+ return crossbow;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the hand from which the crossbow was loaded.
|
|
+ *
|
|
+ * @return the hand
|
|
+ */
|
|
+ @NotNull
|
|
+ public EquipmentSlot getHand() {
|
|
+ return hand;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ *
|
|
+ * @return should the itemstack be consumed
|
|
+ */
|
|
+ public boolean shouldConsumeItem() {
|
|
+ return consumeItem;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ *
|
|
+ * @param consume should the item be consumed
|
|
+ */
|
|
+ public void setConsumeItem(boolean consume) {
|
|
+ this.consumeItem = consume;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Set whether or not to cancel the crossbow being loaded. If canceled, the
|
|
+ * projectile that would be loaded into the crossbow will not be consumed.
|
|
+ *
|
|
+ * @param cancel true if you wish to cancel this event
|
|
+ */
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|