geforkt von Mirrors/Paper
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
54 Zeilen
2.1 KiB
Diff
54 Zeilen
2.1 KiB
Diff
From ea3b8414bda5855c740871c2eeea1c7a1549ab25 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 15 Jun 2013 19:52:04 -0400
|
|
Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
|
|
|
|
Adds ability to get what arrow was shot, and control if it should be consumed.
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
|
|
index 18c5e31ab..37dbc12eb 100644
|
|
--- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
|
|
@@ -2,6 +2,7 @@ package org.bukkit.event.entity;
|
|
|
|
import org.bukkit.entity.Entity;
|
|
import org.bukkit.entity.LivingEntity;
|
|
+import org.bukkit.entity.Projectile; // Paper
|
|
import org.bukkit.event.Cancellable;
|
|
import org.bukkit.event.HandlerList;
|
|
import org.bukkit.inventory.ItemStack;
|
|
@@ -17,9 +18,30 @@ public class EntityShootBowEvent extends EntityEvent implements Cancellable {
|
|
private Entity projectile;
|
|
private final float force;
|
|
private boolean cancelled;
|
|
+ // Paper start
|
|
+ private boolean consumeArrow = true;
|
|
+ private final ItemStack arrowItem;
|
|
+ public void setConsumeArrow(boolean consumeArrow) {
|
|
+ this.consumeArrow = consumeArrow;
|
|
+ }
|
|
+ public boolean getConsumeArrow() {
|
|
+ return consumeArrow;
|
|
+ }
|
|
|
|
+ @NotNull
|
|
+ public ItemStack getArrowItem() {
|
|
+ return arrowItem;
|
|
+ }
|
|
+
|
|
+ @Deprecated
|
|
public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @NotNull final Entity projectile, final float force) {
|
|
+ this(shooter, bow, new ItemStack(org.bukkit.Material.AIR), projectile, force);
|
|
+ }
|
|
+
|
|
+ public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @NotNull ItemStack arrowItem, @NotNull final Entity projectile, final float force) {
|
|
super(shooter);
|
|
+ this.arrowItem = arrowItem;
|
|
+ // Paper end
|
|
this.bow = bow;
|
|
this.projectile = projectile;
|
|
this.force = force;
|
|
--
|
|
2.21.0
|
|
|