mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-21 20:34:51 +02: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
130 lines
3.8 KiB
Diff
130 lines
3.8 KiB
Diff
From 90f823790371eef1c765d366a69f725c7dc628e0 Mon Sep 17 00:00:00 2001
|
|
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
|
|
Date: Sun, 15 Jul 2018 22:17:55 +0300
|
|
Subject: [PATCH] Add TNTPrimeEvent
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
|
|
new file mode 100644
|
|
index 000000000..73dabb82c
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
|
|
@@ -0,0 +1,114 @@
|
|
+package com.destroystokyo.paper.event.block;
|
|
+
|
|
+import org.bukkit.block.Block;
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.block.BlockEvent;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+/**
|
|
+ * Called when TNT block is about to turn into {@link org.bukkit.entity.TNTPrimed}
|
|
+ * <p>
|
|
+ * Cancelling it won't turn TNT into {@link org.bukkit.entity.TNTPrimed} and leaves
|
|
+ * the TNT block as-is
|
|
+ *
|
|
+ * @author Mark Vainomaa
|
|
+ */
|
|
+public class TNTPrimeEvent extends BlockEvent implements Cancellable {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean cancelled;
|
|
+ @NotNull private PrimeReason reason;
|
|
+ @Nullable private Entity primerEntity;
|
|
+
|
|
+ public TNTPrimeEvent(@NotNull Block theBlock, @NotNull PrimeReason reason, @Nullable Entity primerEntity) {
|
|
+ super(theBlock);
|
|
+ this.reason = reason;
|
|
+ this.primerEntity = primerEntity;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the TNT prime reason
|
|
+ *
|
|
+ * @return Prime reason
|
|
+ */
|
|
+ @NotNull
|
|
+ public PrimeReason getReason() {
|
|
+ return this.reason;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the TNT primer {@link Entity}.
|
|
+ *
|
|
+ * It's null if {@link #getReason()} is {@link PrimeReason#REDSTONE} or {@link PrimeReason#FIRE}.
|
|
+ * It's not null if {@link #getReason()} is {@link PrimeReason#ITEM} or {@link PrimeReason#PROJECTILE}
|
|
+ * It might be null if {@link #getReason()} is {@link PrimeReason#EXPLOSION}
|
|
+ *
|
|
+ * @return The {@link Entity} who primed the TNT
|
|
+ */
|
|
+ @Nullable
|
|
+ public Entity getPrimerEntity() {
|
|
+ return this.primerEntity;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets whether spawning {@link org.bukkit.entity.TNTPrimed} should be cancelled or not
|
|
+ *
|
|
+ * @return Whether spawning {@link org.bukkit.entity.TNTPrimed} should be cancelled or not
|
|
+ */
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return this.cancelled;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sets whether to cancel spawning {@link org.bukkit.entity.TNTPrimed} or not
|
|
+ *
|
|
+ * @param cancel whether spawning {@link org.bukkit.entity.TNTPrimed} should be cancelled or not
|
|
+ */
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @Nullable
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @Nullable
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public enum PrimeReason {
|
|
+ /**
|
|
+ * When TNT prime was caused by other explosion (chain reaction)
|
|
+ */
|
|
+ EXPLOSION,
|
|
+
|
|
+ /**
|
|
+ * When TNT prime was caused by fire
|
|
+ */
|
|
+ FIRE,
|
|
+
|
|
+ /**
|
|
+ * When {@link org.bukkit.entity.Player} used {@link org.bukkit.Material#FLINT_AND_STEEL} or
|
|
+ * {@link org.bukkit.Material#FIRE_CHARGE} on given TNT block
|
|
+ */
|
|
+ ITEM,
|
|
+
|
|
+ /**
|
|
+ * When TNT prime was caused by an {@link Entity} shooting TNT
|
|
+ * using a bow with {@link org.bukkit.enchantments.Enchantment#ARROW_FIRE} enchantment
|
|
+ */
|
|
+ PROJECTILE,
|
|
+
|
|
+ /**
|
|
+ * When redstone power triggered the TNT prime
|
|
+ */
|
|
+ REDSTONE
|
|
+ }
|
|
+}
|
|
--
|
|
2.21.0
|
|
|