mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2024-12-04 21:01:01 -05:00
2073436f76
* Implement command block events * Add missing getHandlerList() method
173 lines
4.9 KiB
Diff
173 lines
4.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Allink <arclicious@vivaldi.net>
|
|
Date: Fri, 2 Jun 2023 23:40:13 +0100
|
|
Subject: [PATCH] Add command block player edit event
|
|
|
|
|
|
diff --git a/src/main/java/com/github/atlasmediagroup/scissors/event/block/CommandBlockPlayerEditEvent.java b/src/main/java/com/github/atlasmediagroup/scissors/event/block/CommandBlockPlayerEditEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..983dd3b25800d5f1fcc61415051bf7c28d0147bd
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/github/atlasmediagroup/scissors/event/block/CommandBlockPlayerEditEvent.java
|
|
@@ -0,0 +1,77 @@
|
|
+package com.github.atlasmediagroup.scissors.event.block;
|
|
+
|
|
+import org.bukkit.block.CommandBlock;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.Event;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a command block is modified by a player
|
|
+ */
|
|
+public class CommandBlockPlayerEditEvent extends Event implements Cancellable
|
|
+{
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean cancelled;
|
|
+ private final Player player;
|
|
+ private final String oldCommand;
|
|
+ private String newCommand;
|
|
+ private final CommandBlock commandBlock;
|
|
+
|
|
+ public CommandBlockPlayerEditEvent(@NotNull Player player, @NotNull String oldCommand, @NotNull String newCommand, @NotNull CommandBlock commandBlock)
|
|
+ {
|
|
+ this.player = player;
|
|
+ this.oldCommand = oldCommand;
|
|
+ this.newCommand = newCommand;
|
|
+ this.commandBlock = commandBlock;
|
|
+ }
|
|
+
|
|
+ public @NotNull String getNewCommand()
|
|
+ {
|
|
+ return this.newCommand;
|
|
+ }
|
|
+
|
|
+ public @NotNull String getOldCommand()
|
|
+ {
|
|
+ return this.oldCommand;
|
|
+ }
|
|
+
|
|
+ public void setNewCommand(@NotNull String newCommand)
|
|
+ {
|
|
+ this.newCommand = newCommand;
|
|
+ }
|
|
+
|
|
+ public @NotNull Player getPlayer()
|
|
+ {
|
|
+ return this.player;
|
|
+ }
|
|
+
|
|
+ public @NotNull CommandBlock getCommandBlock()
|
|
+ {
|
|
+ return this.commandBlock;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled()
|
|
+ {
|
|
+ return this.cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel)
|
|
+ {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull HandlerList getHandlers()
|
|
+ {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static @NotNull HandlerList getHandlerList()
|
|
+ {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/com/github/atlasmediagroup/scissors/event/block/CommandMinecartPlayerEditEvent.java b/src/main/java/com/github/atlasmediagroup/scissors/event/block/CommandMinecartPlayerEditEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..2ecaad3d67d3a028a50e998d791de3a829197117
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/github/atlasmediagroup/scissors/event/block/CommandMinecartPlayerEditEvent.java
|
|
@@ -0,0 +1,78 @@
|
|
+package com.github.atlasmediagroup.scissors.event.block;
|
|
+
|
|
+import org.bukkit.block.CommandBlock;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.entity.minecart.CommandMinecart;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.Event;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a command block is modified by a player
|
|
+ */
|
|
+public class CommandMinecartPlayerEditEvent extends Event implements Cancellable
|
|
+{
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private boolean cancelled;
|
|
+ private final Player player;
|
|
+ private final String oldCommand;
|
|
+ private String newCommand;
|
|
+ private final CommandMinecart commandMinecart;
|
|
+
|
|
+ public CommandMinecartPlayerEditEvent(@NotNull Player player, @NotNull String oldCommand, @NotNull String newCommand, @NotNull CommandMinecart commandMinecart)
|
|
+ {
|
|
+ this.player = player;
|
|
+ this.oldCommand = oldCommand;
|
|
+ this.newCommand = newCommand;
|
|
+ this.commandMinecart = commandMinecart;
|
|
+ }
|
|
+
|
|
+ public @NotNull String getNewCommand()
|
|
+ {
|
|
+ return this.newCommand;
|
|
+ }
|
|
+
|
|
+ public @NotNull String getOldCommand()
|
|
+ {
|
|
+ return this.oldCommand;
|
|
+ }
|
|
+
|
|
+ public void setNewCommand(@NotNull String newCommand)
|
|
+ {
|
|
+ this.newCommand = newCommand;
|
|
+ }
|
|
+
|
|
+ public @NotNull Player getPlayer()
|
|
+ {
|
|
+ return this.player;
|
|
+ }
|
|
+
|
|
+ public @NotNull CommandMinecart getCommandMinecart()
|
|
+ {
|
|
+ return this.commandMinecart;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isCancelled()
|
|
+ {
|
|
+ return this.cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel)
|
|
+ {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull HandlerList getHandlers()
|
|
+ {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static @NotNull HandlerList getHandlerList()
|
|
+ {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|