mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-23 17:37:45 +01:00
e4d10a6d67
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: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
99 lines
2.7 KiB
Diff
99 lines
2.7 KiB
Diff
From d5c86c51ddc1719c0e082c9511c566b5643f6e52 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 000000000..9074b2ede
|
|
--- /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;
|
|
+ }
|
|
+}
|
|
--
|
|
2.25.1
|
|
|