Move Event cancellable parts to trait

src/pocketmine/event/CancellableTrait.php

@@ -0,0 +1,47 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+declare(strict_types=1);
+
+namespace pocketmine\event;
+
+/**
+ * This trait implements Cancellable components for events.
+ * @see Cancellable
+ */
+trait CancellableTrait{
+	/** @var bool */
+	private $isCancelled = false;
+
+	/**
+	 * @return bool
+	 */
+	public function isCancelled() : bool{
+		return $this->isCancelled;
+	}
+
+	/**
+	 * @param bool $value
+	 */
+	public function setCancelled(bool $value = true) : void{
+		$this->isCancelled = $value;
+	}
+}

src/pocketmine/event/Event.php

@@ -36,8 +36,6 @@ abstract class Event{
 
 	/** @var string|null */
 	protected $eventName = null;
-	/** @var bool */
-	private $isCancelled = false;
 
 	/**
 	 * @return string
@@ -46,34 +44,6 @@ abstract class Event{
 		return $this->eventName ?? get_class($this);
 	}
 
-	/**
-	 * @return bool
-	 *
-	 * @throws \BadMethodCallException
-	 */
-	public function isCancelled() : bool{
-		if(!($this instanceof Cancellable)){
-			throw new \BadMethodCallException(get_class($this) . " is not Cancellable");
-		}
-
-		/** @var Event $this */
-		return $this->isCancelled;
-	}
-
-	/**
-	 * @param bool $value
-	 *
-	 * @throws \BadMethodCallException
-	 */
-	public function setCancelled(bool $value = true) : void{
-		if(!($this instanceof Cancellable)){
-			throw new \BadMethodCallException(get_class($this) . " is not Cancellable");
-		}
-
-		/** @var Event $this */
-		$this->isCancelled = $value;
-	}
-
 	/**
 	 * Calls event handlers registered for this event.
 	 *

src/pocketmine/event/block/BlockBreakEvent.php

@@ -25,6 +25,7 @@ namespace pocketmine\event\block;
 
 use pocketmine\block\Block;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\item\Item;
 use pocketmine\Player;
 
@@ -32,6 +33,8 @@ use pocketmine\Player;
  * Called when a player destroys a block somewhere in the world.
  */
 class BlockBreakEvent extends BlockEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Player */
 	protected $player;
 

src/pocketmine/event/block/BlockBurnEvent.php

@@ -25,11 +25,14 @@ namespace pocketmine\event\block;
 
 use pocketmine\block\Block;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 /**
  * Called when a block is burned away by fire.
  */
 class BlockBurnEvent extends BlockEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Block */
 	private $causingBlock;
 

src/pocketmine/event/block/BlockGrowEvent.php

@@ -25,11 +25,14 @@ namespace pocketmine\event\block;
 
 use pocketmine\block\Block;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 /**
  * Called when plants or crops grow.
  */
 class BlockGrowEvent extends BlockEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Block */
 	private $newState;
 

src/pocketmine/event/block/BlockPlaceEvent.php

@@ -25,6 +25,7 @@ namespace pocketmine\event\block;
 
 use pocketmine\block\Block;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\item\Item;
 use pocketmine\Player;
 
@@ -32,6 +33,8 @@ use pocketmine\Player;
  * Called when a player places a block
  */
 class BlockPlaceEvent extends BlockEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Player */
 	protected $player;
 

src/pocketmine/event/block/BlockUpdateEvent.php

@@ -24,10 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\event\block;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 /**
  * Called when a block tries to be updated due to a neighbor change
  */
 class BlockUpdateEvent extends BlockEvent implements Cancellable{
-
+	use CancellableTrait;
 }

src/pocketmine/event/block/LeavesDecayEvent.php

@@ -24,10 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\event\block;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 /**
  * Called when leaves decay due to not being attached to wood.
  */
 class LeavesDecayEvent extends BlockEvent implements Cancellable{
-
+	use CancellableTrait;
 }

src/pocketmine/event/block/SignChangeEvent.php

@@ -25,6 +25,7 @@ namespace pocketmine\event\block;
 
 use pocketmine\block\Block;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\Player;
 use function count;
 
@@ -32,6 +33,8 @@ use function count;
  * Called when a sign is changed by a player.
  */
 class SignChangeEvent extends BlockEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Player */
 	private $player;
 	/** @var string[] */

src/pocketmine/event/entity/EntityBlockChangeEvent.php

@@ -26,11 +26,14 @@ namespace pocketmine\event\entity;
 use pocketmine\block\Block;
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 /**
  * Called when an Entity, excluding players, changes a block directly
  */
 class EntityBlockChangeEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Block */
 	private $from;
 	/** @var Block */

src/pocketmine/event/entity/EntityCombustEvent.php

@@ -25,8 +25,11 @@ namespace pocketmine\event\entity;
 
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 class EntityCombustEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	protected $duration;
 
 	/**

src/pocketmine/event/entity/EntityDamageEvent.php

@@ -25,12 +25,15 @@ namespace pocketmine\event\entity;
 
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use function array_sum;
 
 /**
  * Called when an entity takes damage.
  */
 class EntityDamageEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	public const MODIFIER_ARMOR = 1;
 	public const MODIFIER_STRENGTH = 2;
 	public const MODIFIER_WEAKNESS = 3;

src/pocketmine/event/entity/EntityEffectEvent.php

@@ -26,8 +26,11 @@ namespace pocketmine\event\entity;
 use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 class EntityEffectEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var EffectInstance */
 	private $effect;
 

src/pocketmine/event/entity/EntityExplodeEvent.php

@@ -26,12 +26,15 @@ namespace pocketmine\event\entity;
 use pocketmine\block\Block;
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\level\Position;
 
 /**
  * Called when a entity explodes
  */
 class EntityExplodeEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Position */
 	protected $position;
 

src/pocketmine/event/entity/EntityInventoryChangeEvent.php

@@ -25,12 +25,15 @@ namespace pocketmine\event\entity;
 
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\item\Item;
 
 /**
  * Called before a slot in an entity's inventory changes.
  */
 class EntityInventoryChangeEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Item */
 	private $oldItem;
 	/** @var Item */

src/pocketmine/event/entity/EntityLevelChangeEvent.php

@@ -25,9 +25,12 @@ namespace pocketmine\event\entity;
 
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\level\Level;
 
 class EntityLevelChangeEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Level */
 	private $originLevel;
 	/** @var Level */

src/pocketmine/event/entity/EntityMotionEvent.php

@@ -25,9 +25,12 @@ namespace pocketmine\event\entity;
 
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\math\Vector3;
 
 class EntityMotionEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Vector3 */
 	private $mot;
 

src/pocketmine/event/entity/EntityRegainHealthEvent.php

@@ -25,8 +25,11 @@ namespace pocketmine\event\entity;
 
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 class EntityRegainHealthEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	public const CAUSE_REGEN = 0;
 	public const CAUSE_EATING = 1;
 	public const CAUSE_MAGIC = 2;

src/pocketmine/event/entity/EntityShootBowEvent.php

@@ -27,10 +27,13 @@ use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
 use pocketmine\entity\projectile\Projectile;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\item\Item;
 use function count;
 
 class EntityShootBowEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Item */
 	private $bow;
 	/** @var Projectile */

src/pocketmine/event/entity/EntityTeleportEvent.php

@@ -25,9 +25,12 @@ namespace pocketmine\event\entity;
 
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\level\Position;
 
 class EntityTeleportEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Position */
 	private $from;
 	/** @var Position */

src/pocketmine/event/entity/ExplosionPrimeEvent.php

@@ -25,11 +25,14 @@ namespace pocketmine\event\entity;
 
 use pocketmine\entity\Entity;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 /**
  * Called when a entity decides to explode
  */
 class ExplosionPrimeEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var float */
 	protected $force;
 	/** @var bool */

src/pocketmine/event/entity/ItemDespawnEvent.php

@@ -25,8 +25,10 @@ namespace pocketmine\event\entity;
 
 use pocketmine\entity\object\ItemEntity;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 class ItemDespawnEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
 
 	/**
 	 * @param ItemEntity $item

src/pocketmine/event/entity/ProjectileLaunchEvent.php

@@ -25,8 +25,11 @@ namespace pocketmine\event\entity;
 
 use pocketmine\entity\projectile\Projectile;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 class ProjectileLaunchEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	/**
 	 * @param Projectile $entity
 	 */

src/pocketmine/event/inventory/CraftItemEvent.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\event\inventory;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\event\Event;
 use pocketmine\inventory\CraftingRecipe;
 use pocketmine\inventory\transaction\CraftingTransaction;
@@ -31,6 +32,8 @@ use pocketmine\item\Item;
 use pocketmine\Player;
 
 class CraftItemEvent extends Event implements Cancellable{
+	use CancellableTrait;
+
 	/** @var CraftingTransaction */
 	private $transaction;
 	/** @var CraftingRecipe */

src/pocketmine/event/inventory/FurnaceBurnEvent.php

@@ -25,10 +25,13 @@ namespace pocketmine\event\inventory;
 
 use pocketmine\event\block\BlockEvent;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\item\Item;
 use pocketmine\tile\Furnace;
 
 class FurnaceBurnEvent extends BlockEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Furnace */
 	private $furnace;
 	/** @var Item */

src/pocketmine/event/inventory/FurnaceSmeltEvent.php

@@ -25,10 +25,13 @@ namespace pocketmine\event\inventory;
 
 use pocketmine\event\block\BlockEvent;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\item\Item;
 use pocketmine\tile\Furnace;
 
 class FurnaceSmeltEvent extends BlockEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Furnace */
 	private $furnace;
 	/** @var Item */

src/pocketmine/event/inventory/InventoryOpenEvent.php

@@ -24,10 +24,13 @@ declare(strict_types=1);
 namespace pocketmine\event\inventory;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\inventory\Inventory;
 use pocketmine\Player;
 
 class InventoryOpenEvent extends InventoryEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Player */
 	private $who;
 

src/pocketmine/event/inventory/InventoryPickupArrowEvent.php

@@ -25,9 +25,12 @@ namespace pocketmine\event\inventory;
 
 use pocketmine\entity\projectile\Arrow;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\inventory\Inventory;
 
 class InventoryPickupArrowEvent extends InventoryEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Arrow */
 	private $arrow;
 

src/pocketmine/event/inventory/InventoryPickupItemEvent.php

@@ -25,9 +25,12 @@ namespace pocketmine\event\inventory;
 
 use pocketmine\entity\object\ItemEntity;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\inventory\Inventory;
 
 class InventoryPickupItemEvent extends InventoryEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var ItemEntity */
 	private $item;
 

src/pocketmine/event/inventory/InventoryTransactionEvent.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\event\inventory;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\event\Event;
 use pocketmine\inventory\transaction\InventoryTransaction;
 
@@ -32,6 +33,8 @@ use pocketmine\inventory\transaction\InventoryTransaction;
  * The source of this can be a Player, entities, mobs, or even hoppers in the future!
  */
 class InventoryTransactionEvent extends Event implements Cancellable{
+	use CancellableTrait;
+
 	/** @var InventoryTransaction */
 	private $transaction;
 

src/pocketmine/event/level/ChunkUnloadEvent.php

@@ -24,10 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\event\level;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 /**
  * Called when a Chunk is unloaded
  */
 class ChunkUnloadEvent extends ChunkEvent implements Cancellable{
-
+	use CancellableTrait;
 }

src/pocketmine/event/level/LevelUnloadEvent.php

@@ -24,10 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\event\level;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 /**
  * Called when a Level is unloaded
  */
 class LevelUnloadEvent extends LevelEvent implements Cancellable{
-
+	use CancellableTrait;
 }

src/pocketmine/event/player/PlayerAchievementAwardedEvent.php

@@ -24,12 +24,15 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\Player;
 
 /**
  * Called when a player is awarded an achievement
  */
 class PlayerAchievementAwardedEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var string */
 	protected $achievement;
 

src/pocketmine/event/player/PlayerAnimationEvent.php

@@ -24,12 +24,15 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\Player;
 
 /**
  * Called when a player does an animation
  */
 class PlayerAnimationEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var int */
 	private $animationType;
 

src/pocketmine/event/player/PlayerBedEnterEvent.php

@@ -25,9 +25,12 @@ namespace pocketmine\event\player;
 
 use pocketmine\block\Block;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\Player;
 
 class PlayerBedEnterEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Block */
 	private $bed;
 

src/pocketmine/event/player/PlayerBlockPickEvent.php

@@ -25,6 +25,7 @@ namespace pocketmine\event\player;
 
 use pocketmine\block\Block;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\item\Item;
 use pocketmine\Player;
 
@@ -32,6 +33,8 @@ use pocketmine\Player;
  * Called when a player middle-clicks on a block to get an item in creative mode.
  */
 class PlayerBlockPickEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Block */
 	private $blockClicked;
 	/** @var Item */

src/pocketmine/event/player/PlayerBucketEvent.php

@@ -25,6 +25,7 @@ namespace pocketmine\event\player;
 
 use pocketmine\block\Block;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\item\Item;
 use pocketmine\Player;
 
@@ -32,6 +33,8 @@ use pocketmine\Player;
  * @allowHandle
  */
 abstract class PlayerBucketEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Block */
 	private $blockClicked;
 	/** @var int */

src/pocketmine/event/player/PlayerChangeSkinEvent.php

@@ -25,12 +25,15 @@ namespace pocketmine\event\player;
 
 use pocketmine\entity\Skin;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\Player;
 
 /**
  * Called when a player changes their skin in-game.
  */
 class PlayerChangeSkinEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Skin */
 	private $oldSkin;
 	/** @var Skin */

src/pocketmine/event/player/PlayerChatEvent.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\permission\PermissionManager;
 use pocketmine\Player;
 use pocketmine\Server;
@@ -32,6 +33,8 @@ use pocketmine\Server;
  * Called when a player chats something
  */
 class PlayerChatEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var string */
 	protected $message;
 

src/pocketmine/event/player/PlayerCommandPreprocessEvent.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\Player;
 
 /**
@@ -35,6 +36,8 @@ use pocketmine\Player;
  * The message contains a slash at the start
  */
 class PlayerCommandPreprocessEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var string */
 	protected $message;
 

src/pocketmine/event/player/PlayerDataSaveEvent.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\event\Event;
 use pocketmine\IPlayer;
 use pocketmine\nbt\tag\CompoundTag;
@@ -33,6 +34,8 @@ use pocketmine\Server;
  * Called when a player's data is about to be saved to disk.
  */
 class PlayerDataSaveEvent extends Event implements Cancellable{
+	use CancellableTrait;
+
 	/** @var CompoundTag */
 	protected $data;
 	/** @var string */

src/pocketmine/event/player/PlayerDropItemEvent.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\item\Item;
 use pocketmine\Player;
 
@@ -31,6 +32,8 @@ use pocketmine\Player;
  * Called when a player tries to drop an item from its hotbar
  */
 class PlayerDropItemEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Item */
 	private $drop;
 

src/pocketmine/event/player/PlayerDuplicateLoginEvent.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\event\Event;
 use pocketmine\network\mcpe\NetworkSession;
 
@@ -32,6 +33,7 @@ use pocketmine\network\mcpe\NetworkSession;
  * If cancelled, the newly connecting session will be disconnected; otherwise, the existing player will be disconnected.
  */
 class PlayerDuplicateLoginEvent extends Event implements Cancellable{
+	use CancellableTrait;
 
 	/** @var NetworkSession */
 	private $connectingSession;

src/pocketmine/event/player/PlayerEditBookEvent.php

@@ -24,10 +24,13 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\item\WritableBook;
 use pocketmine\Player;
 
 class PlayerEditBookEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	public const ACTION_REPLACE_PAGE = 0;
 	public const ACTION_ADD_PAGE = 1;
 	public const ACTION_DELETE_PAGE = 2;

src/pocketmine/event/player/PlayerExhaustEvent.php

@@ -25,9 +25,12 @@ namespace pocketmine\event\player;
 
 use pocketmine\entity\Human;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\event\entity\EntityEvent;
 
 class PlayerExhaustEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	public const CAUSE_ATTACK = 1;
 	public const CAUSE_DAMAGE = 2;
 	public const CAUSE_MINING = 3;

src/pocketmine/event/player/PlayerExperienceChangeEvent.php

@@ -25,12 +25,15 @@ namespace pocketmine\event\player;
 
 use pocketmine\entity\Human;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\event\entity\EntityEvent;
 
 /**
  * Called when a player gains or loses XP levels and/or progress.
  */
 class PlayerExperienceChangeEvent extends EntityEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Human */
 	protected $entity;
 	/** @var int */

src/pocketmine/event/player/PlayerGameModeChangeEvent.php

@@ -24,12 +24,15 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\Player;
 
 /**
  * Called when a player has its gamemode changed
  */
 class PlayerGameModeChangeEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var int */
 	protected $gamemode;
 

src/pocketmine/event/player/PlayerInteractEvent.php

@@ -25,6 +25,7 @@ namespace pocketmine\event\player;
 
 use pocketmine\block\Block;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -33,6 +34,8 @@ use pocketmine\Player;
  * Called when a player interacts or touches a block (including air?)
  */
 class PlayerInteractEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	public const LEFT_CLICK_BLOCK = 0;
 	public const RIGHT_CLICK_BLOCK = 1;
 

src/pocketmine/event/player/PlayerItemConsumeEvent.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\item\Item;
 use pocketmine\Player;
 
@@ -31,6 +32,8 @@ use pocketmine\Player;
  * Called when a player eats something
  */
 class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Item */
 	private $item;
 

src/pocketmine/event/player/PlayerItemHeldEvent.php

@@ -24,10 +24,13 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\item\Item;
 use pocketmine\Player;
 
 class PlayerItemHeldEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Item */
 	private $item;
 	/** @var int */

src/pocketmine/event/player/PlayerItemUseEvent.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\item\Item;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -32,6 +33,7 @@ use pocketmine\Player;
  * Called when a player uses its held item, for example when throwing a projectile.
  */
 class PlayerItemUseEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
 
 	/** @var Item */
 	private $item;

src/pocketmine/event/player/PlayerKickEvent.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\lang\TextContainer;
 use pocketmine\Player;
 
@@ -31,6 +32,8 @@ use pocketmine\Player;
  * Called when a player leaves the server
  */
 class PlayerKickEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var TextContainer|string */
 	protected $quitMessage;
 

src/pocketmine/event/player/PlayerLoginEvent.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\Player;
 
 /**
@@ -32,6 +33,8 @@ use pocketmine\Player;
  * Cancelling this event will cause the player to be disconnected with the kick message set.
  */
 class PlayerLoginEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var string */
 	protected $kickMessage;
 

src/pocketmine/event/player/PlayerMoveEvent.php

@@ -24,10 +24,13 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\level\Location;
 use pocketmine\Player;
 
 class PlayerMoveEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Location */
 	private $from;
 	/** @var Location */

src/pocketmine/event/player/PlayerToggleFlightEvent.php

@@ -24,9 +24,12 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\Player;
 
 class PlayerToggleFlightEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var bool */
 	protected $isFlying;
 

src/pocketmine/event/player/PlayerToggleSneakEvent.php

@@ -24,9 +24,12 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\Player;
 
 class PlayerToggleSneakEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var bool */
 	protected $isSneaking;
 

src/pocketmine/event/player/PlayerToggleSprintEvent.php

@@ -24,9 +24,12 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\Player;
 
 class PlayerToggleSprintEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var bool */
 	protected $isSprinting;
 

src/pocketmine/event/player/PlayerTransferEvent.php

@@ -24,9 +24,12 @@ declare(strict_types=1);
 namespace pocketmine\event\player;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\Player;
 
 class PlayerTransferEvent extends PlayerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var string */
 	protected $address;
 	/** @var int */

src/pocketmine/event/player/cheat/PlayerIllegalMoveEvent.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace pocketmine\event\player\cheat;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -32,6 +33,8 @@ use pocketmine\Player;
  * Called when a player attempts to perform movement cheats such as clipping through blocks.
  */
 class PlayerIllegalMoveEvent extends PlayerCheatEvent implements Cancellable{
+	use CancellableTrait;
+
 
 	/** @var Vector3 */
 	private $attemptedPosition;

src/pocketmine/event/server/CommandEvent.php

@@ -25,6 +25,7 @@ namespace pocketmine\event\server;
 
 use pocketmine\command\CommandSender;
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 /**
  * Called when any CommandSender runs a command, early in the process
@@ -35,6 +36,8 @@ use pocketmine\event\Cancellable;
  * The message DOES NOT contain a slash at the start
  */
 class CommandEvent extends ServerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var string */
 	protected $command;
 

src/pocketmine/event/server/DataPacketBroadcastEvent.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\event\server;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\network\mcpe\protocol\DataPacket;
 use pocketmine\Player;
 
@@ -31,6 +32,8 @@ use pocketmine\Player;
  * Called when a list of packets is broadcasted to 1 or more players.
  */
 class DataPacketBroadcastEvent extends ServerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var Player[] */
 	private $players;
 	/** @var DataPacket[] */

src/pocketmine/event/server/DataPacketReceiveEvent.php

@@ -24,10 +24,13 @@ declare(strict_types=1);
 namespace pocketmine\event\server;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\network\mcpe\protocol\DataPacket;
 use pocketmine\Player;
 
 class DataPacketReceiveEvent extends ServerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var DataPacket */
 	private $packet;
 	/** @var Player */

src/pocketmine/event/server/DataPacketSendEvent.php

@@ -24,10 +24,13 @@ declare(strict_types=1);
 namespace pocketmine\event\server;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 use pocketmine\network\mcpe\protocol\DataPacket;
 use pocketmine\Player;
 
 class DataPacketSendEvent extends ServerEvent implements Cancellable{
+	use CancellableTrait;
+
 	/** @var DataPacket */
 	private $packet;
 	/** @var Player */

src/pocketmine/event/server/NetworkInterfaceRegisterEvent.php

@@ -24,10 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\event\server;
 
 use pocketmine\event\Cancellable;
+use pocketmine\event\CancellableTrait;
 
 /**
  * Called when a network interface is registered into the network, for example the RakLib interface.
  */
 class NetworkInterfaceRegisterEvent extends NetworkInterfaceEvent implements Cancellable{
-
+	use CancellableTrait;
 }