Skip to content
This repository has been archived by the owner on Aug 31, 2019. It is now read-only.

Add PlayerReceiveBeaconEffectEvent #172

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add PlayerReceiveBeaconEffectEvent #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions Bukkit/0061-Add-PlayerReceiveBeaconEffectEvent.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
From 79035b05beb6af1e963b3b3b8ff6544b1ad2af9f Mon Sep 17 00:00:00 2001
From: Electroid <[email protected]>
Date: Tue, 28 Jul 2015 21:35:49 -0700
Subject: [PATCH] Add PlayerReceiveBeaconEffectEvent


diff --git a/src/main/java/org/bukkit/event/player/PlayerReceiveBeaconEffectEvent.java b/src/main/java/org/bukkit/event/player/PlayerReceiveBeaconEffectEvent.java
new file mode 100644
index 0000000..aabe274
--- /dev/null
+++ b/src/main/java/org/bukkit/event/player/PlayerReceiveBeaconEffectEvent.java
@@ -0,0 +1,64 @@
+package org.bukkit.event.player;
+
+import com.google.common.base.Preconditions;
+import org.bukkit.block.Beacon;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.potion.PotionEffect;
+
+/**
+ * Called when a player receives a potion effect from a beacon.
+ */
+public class PlayerReceiveBeaconEffectEvent extends PlayerEvent implements Cancellable {
+
+ private static final HandlerList handlers = new HandlerList();
+ private final Beacon beacon;
+ private PotionEffect effect;
+ private boolean cancelled;
+
+ public PlayerReceiveBeaconEffectEvent(Player player, Beacon beacon, PotionEffect effect) {
+ super(player);
+ this.beacon = beacon;
+ this.effect = effect;
+ }
+
+ /**
+ * Get the beacon that gave the potion effect to the player.
+ */
+ public Beacon getBeacon() {
+ return beacon;
+ }
+
+ /**
+ * Get the potion effect that the player received from the beacon.
+ */
+ public PotionEffect getEffect() {
+ return effect;
+ }
+
+ /**
+ * Sets the new potion effect to be applied to the player.
+ */
+ public void setEffect(PotionEffect newEffect) {
+ effect = Preconditions.checkNotNull(newEffect, "new effect cannot be null");
+ }
+
+ public boolean isCancelled() {
+ return cancelled;
+ }
+
+ public void setCancelled(boolean cancel) {
+ this.cancelled = cancel;
+ }
+
+ @Override
+ public HandlerList getHandlers() {
+ return handlers;
+ }
+
+ public static HandlerList getHandlerList() {
+ return handlers;
+ }
+
+}
--
1.9.3 (Apple Git-50)

72 changes: 72 additions & 0 deletions CraftBukkit/0125-Add-PlayerReceiveBeaconEffectEvent.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
From 3b31036fabf80c63853398df44d2bff2b2d6bf72 Mon Sep 17 00:00:00 2001
From: Electroid <[email protected]>
Date: Tue, 28 Jul 2015 21:31:58 -0700
Subject: [PATCH] Add PlayerReceiveBeaconEffectEvent


diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java
index 4f280dd..473692a 100644
--- a/src/main/java/net/minecraft/server/TileEntityBeacon.java
+++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java
@@ -1,13 +1,20 @@
package net.minecraft.server;

import com.google.common.collect.Lists;
+
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;

// CraftBukkit start
+import org.bukkit.Bukkit;
+import org.bukkit.block.Beacon;
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.potion.CraftPotionUtils;
import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerReceiveBeaconEffectEvent;
// CraftBukkit end

public class TileEntityBeacon extends TileEntityContainer implements IUpdatePlayerListBox, IInventory {
@@ -79,17 +86,28 @@ public class TileEntityBeacon extends TileEntityContainer implements IUpdatePlay

while (iterator.hasNext()) {
entityhuman = (EntityHuman) iterator.next();
- entityhuman.addEffect(new MobEffect(this.k, 180, b0, true, true));
- }
-
- if (this.j >= 4 && this.k != this.l && this.l > 0) {
- iterator = list.iterator();
-
- while (iterator.hasNext()) {
- entityhuman = (EntityHuman) iterator.next();
- entityhuman.addEffect(new MobEffect(this.l, 180, 0, true, true));
+ // SportBukkit start - fire PlayerReceiveBeaconEffectEvent
+ List<MobEffect> effects = new ArrayList<MobEffect>();
+ effects.add(new MobEffect(this.k, 180, b0, true, true));
+ // Add the secondary effect if it exists
+ if (this.j >= 4 && this.k != this.l && this.l > 0) {
+ effects.add(new MobEffect(this.l, 180, 0, true, true));
}
+ // Fire an event for each effect in the list
+ for (MobEffect effect : effects) {
+ PlayerReceiveBeaconEffectEvent event = new PlayerReceiveBeaconEffectEvent(
+ (Player) entityhuman.getBukkitEntity(),
+ (Beacon) entityhuman.getBukkitEntity().getWorld().getBlockAt(getPosition().getX(), getPosition().getY(), getPosition().getZ()).getState(),
+ CraftPotionUtils.toBukkit(effect));
+ Bukkit.getPluginManager().callEvent(event);
+ if (!event.isCancelled()) {
+ // Finally apply the potion effect to the player
+ entityhuman.addEffect(CraftPotionUtils.toNMS(event.getEffect()));
+ }
+ }
+ // SportBukkit end
}
+
}

}
--
1.9.3 (Apple Git-50)