36f34f01c0
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: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
96 Zeilen
2.7 KiB
Diff
96 Zeilen
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 21 Jul 2018 03:10:50 -0500
|
|
Subject: [PATCH] PlayerLaunchProjectileEvent
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..9074b2ede01f76c0560e5318246382163cc91591
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java
|
|
@@ -0,0 +1,83 @@
|
|
+package com.destroystokyo.paper.event.player;
|
|
+
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.entity.Projectile;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.player.PlayerEvent;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a player shoots a projectile
|
|
+ */
|
|
+public class PlayerLaunchProjectileEvent extends PlayerEvent implements Cancellable {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ @NotNull private final Projectile projectile;
|
|
+ @NotNull private final ItemStack itemStack;
|
|
+ private boolean consumeItem = true;
|
|
+ private boolean cancelled;
|
|
+
|
|
+ public PlayerLaunchProjectileEvent(@NotNull Player shooter, @NotNull ItemStack itemStack, @NotNull Projectile projectile) {
|
|
+ super(shooter);
|
|
+ this.itemStack = itemStack;
|
|
+ this.projectile = projectile;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the projectile which will be launched by this event
|
|
+ *
|
|
+ * @return the launched projectile
|
|
+ */
|
|
+ @NotNull
|
|
+ public Projectile getProjectile() {
|
|
+ return projectile;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the ItemStack used to fire the projectile
|
|
+ *
|
|
+ * @return The ItemStack used
|
|
+ */
|
|
+ @NotNull
|
|
+ public ItemStack getItemStack() {
|
|
+ return itemStack;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get whether to consume the ItemStack or not
|
|
+ *
|
|
+ * @return True to consume
|
|
+ */
|
|
+ public boolean shouldConsume() {
|
|
+ return consumeItem;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Set whether to consume the ItemStack or not
|
|
+ *
|
|
+ * @param consumeItem True to consume
|
|
+ */
|
|
+ public void setShouldConsume(boolean consumeItem) {
|
|
+ this.consumeItem = consumeItem;
|
|
+ }
|
|
+
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|