Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +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
99 Zeilen
2.7 KiB
Diff
99 Zeilen
2.7 KiB
Diff
From 14fef5c201ad5836364dd92e4ced6ece41fd8307 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.21.0
|
|
|