Skip to content

Commit

Permalink
ShoutAreaOfEffectEvent
Browse files Browse the repository at this point in the history
Allows us to remove affected entities (namely dropped items for shops)
  • Loading branch information
RoboMWM committed Feb 4, 2017
1 parent 84bf9cc commit a9a77eb
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 4 deletions.
2 changes: 1 addition & 1 deletion plugin.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name: TheThuum
main: com.reilaos.bukkit.TheThuum.Plugin
version: 0.4.7
version: 0.6
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.reilaos.bukkit</groupId>
<artifactId>TheThuum</artifactId>
<version>0.5</version>
<version>0.6</version>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
Expand Down Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>com.destroystokyo.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.11-R0.1-SNAPSHOT</version>
<version>1.11.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
7 changes: 6 additions & 1 deletion src/com/reilaos/bukkit/TheThuum/Shared.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import java.util.LinkedList;
import java.util.List;

import com.reilaos.bukkit.TheThuum.shouts.ShoutAreaOfEffectEvent;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -32,6 +34,9 @@ public static List<Entity> getAreaOfEffect(Player dragonBorn, int radius, int le

returnMe.add(victim);
}
return returnMe;

ShoutAreaOfEffectEvent event = new ShoutAreaOfEffectEvent(returnMe);
Bukkit.getPluginManager().callEvent(event);
return event.getAffectedEntities();
}
}
42 changes: 42 additions & 0 deletions src/com/reilaos/bukkit/TheThuum/shouts/ShoutAreaOfEffectEvent.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package com.reilaos.bukkit.TheThuum.shouts;

import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;

import java.util.List;

/**
* Created by RoboMWM on 2/4/2017.
* @see com.reilaos.bukkit.TheThuum.Shared#getAreaOfEffect(Player, int, int)
*/
public class ShoutAreaOfEffectEvent extends Event
{
// Custom Event Requirements
private static final HandlerList handlers = new HandlerList();
public static HandlerList getHandlerList() {
return handlers;
}
@Override
public HandlerList getHandlers() {
return handlers;
}

List<Entity> affectedEntities;

public ShoutAreaOfEffectEvent(List<Entity> affectedEntities)
{
this.affectedEntities = affectedEntities;
}

public List<Entity> getAffectedEntities()
{
return this.affectedEntities;
}

public void setAffectedEntities(List<Entity> newAffectedEntities)
{
this.affectedEntities = newAffectedEntities;
}
}

0 comments on commit a9a77eb

Please sign in to comment.