From 226aaa2ba20582b7cec88153788806efef7a4540 Mon Sep 17 00:00:00 2001 From: Len <40720638+destro174@users.noreply.github.com> Date: Sat, 9 Jul 2022 16:34:00 +0200 Subject: [PATCH] Refactor events --- .../api/events/PlayerCreateShopEvent.java | 13 +++----- .../api/events/PlayerDestroyShopEvent.java | 13 +++----- .../api/events/PlayerExchangeShopEvent.java | 13 +++----- .../api/events/PlayerInitializeShopEvent.java | 13 +++----- .../playershops/api/events/ShopEvent.java | 30 +++++++++++++++++++ 5 files changed, 46 insertions(+), 36 deletions(-) create mode 100644 api/src/main/java/com/alttd/playershops/api/events/ShopEvent.java diff --git a/api/src/main/java/com/alttd/playershops/api/events/PlayerCreateShopEvent.java b/api/src/main/java/com/alttd/playershops/api/events/PlayerCreateShopEvent.java index d992484..7a9db05 100644 --- a/api/src/main/java/com/alttd/playershops/api/events/PlayerCreateShopEvent.java +++ b/api/src/main/java/com/alttd/playershops/api/events/PlayerCreateShopEvent.java @@ -7,25 +7,20 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; -public class PlayerCreateShopEvent extends Event implements Cancellable { +public class PlayerCreateShopEvent extends ShopEvent { private static final HandlerList handlers = new HandlerList(); private final Player player; - private final Shop shop; private boolean cancelled; - public PlayerCreateShopEvent(Player p, Shop s) { - player = p; - shop = s; + public PlayerCreateShopEvent(Player player, Shop shop) { + super(shop); + this.player = player; } public Player getPlayer() { return player; } - public Shop getShop() { - return shop; - } - @Override public boolean isCancelled() { return cancelled; diff --git a/api/src/main/java/com/alttd/playershops/api/events/PlayerDestroyShopEvent.java b/api/src/main/java/com/alttd/playershops/api/events/PlayerDestroyShopEvent.java index f5dd992..1b714be 100644 --- a/api/src/main/java/com/alttd/playershops/api/events/PlayerDestroyShopEvent.java +++ b/api/src/main/java/com/alttd/playershops/api/events/PlayerDestroyShopEvent.java @@ -7,26 +7,21 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; -public class PlayerDestroyShopEvent extends Event implements Cancellable { +public class PlayerDestroyShopEvent extends ShopEvent { private static final HandlerList handlers = new HandlerList(); private final Player player; - private final Shop shop; private boolean cancelled; - public PlayerDestroyShopEvent(Player p, Shop s) { - player = p; - shop = s; + public PlayerDestroyShopEvent(Player player, Shop shop) { + super(shop); + this.player = player; } public Player getPlayer() { return player; } - public Shop getShop() { - return shop; - } - @Override public boolean isCancelled() { return cancelled; diff --git a/api/src/main/java/com/alttd/playershops/api/events/PlayerExchangeShopEvent.java b/api/src/main/java/com/alttd/playershops/api/events/PlayerExchangeShopEvent.java index 154f6f1..9e4a055 100644 --- a/api/src/main/java/com/alttd/playershops/api/events/PlayerExchangeShopEvent.java +++ b/api/src/main/java/com/alttd/playershops/api/events/PlayerExchangeShopEvent.java @@ -7,26 +7,21 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; -public class PlayerExchangeShopEvent extends Event implements Cancellable { +public class PlayerExchangeShopEvent extends ShopEvent { private static final HandlerList handlers = new HandlerList(); private final Player player; - private final Shop shop; private boolean cancelled; - public PlayerExchangeShopEvent(Player p, Shop s) { - player = p; - shop = s; + public PlayerExchangeShopEvent(Player player, Shop shop) { + super(shop); + this.player = player; } public Player getPlayer() { return player; } - public Shop getShop() { - return shop; - } - @Override public boolean isCancelled() { return cancelled; diff --git a/api/src/main/java/com/alttd/playershops/api/events/PlayerInitializeShopEvent.java b/api/src/main/java/com/alttd/playershops/api/events/PlayerInitializeShopEvent.java index 9755113..f31e627 100644 --- a/api/src/main/java/com/alttd/playershops/api/events/PlayerInitializeShopEvent.java +++ b/api/src/main/java/com/alttd/playershops/api/events/PlayerInitializeShopEvent.java @@ -7,26 +7,21 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; -public class PlayerInitializeShopEvent extends Event implements Cancellable { +public class PlayerInitializeShopEvent extends ShopEvent { private static final HandlerList handlers = new HandlerList(); private final Player player; - private final Shop shop; private boolean cancelled; - public PlayerInitializeShopEvent(Player p, Shop s) { - player = p; - shop = s; + public PlayerInitializeShopEvent(Player player, Shop shop) { + super(shop); + this.player = player; } public Player getPlayer() { return player; } - public Shop getShop() { - return shop; - } - @Override public boolean isCancelled() { return cancelled; diff --git a/api/src/main/java/com/alttd/playershops/api/events/ShopEvent.java b/api/src/main/java/com/alttd/playershops/api/events/ShopEvent.java new file mode 100644 index 0000000..797531f --- /dev/null +++ b/api/src/main/java/com/alttd/playershops/api/events/ShopEvent.java @@ -0,0 +1,30 @@ +package com.alttd.playershops.api.events; + +import com.alttd.playershops.api.Shop; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; + +public abstract class ShopEvent extends Event implements Cancellable { + + private boolean cancelled; + private final Shop shop; + + public ShopEvent(Shop shop) { + this.shop = shop; + } + + public Shop getShop() { + return shop; + } + + @Override + public boolean isCancelled() { + return cancelled; + } + + @Override + public void setCancelled(boolean b) { + this.cancelled = true; + } + +}