Upstream/AreaShop
1
0
Fork 0
mirror of https://github.com/NLthijs48/AreaShop.git synced 2025-02-16 20:01:41 +01:00
Code Issues Projects Releases Wiki Activity

Rename events to be consistent with commands

Browse Source 
- AddFriendEvent -> AddedFriendEvent
- DeleteFriendEvent -> DeletedFriendEvent
- RemovedRegionEvent -> DeletedRegionEvent
This commit is contained in:
Thijs Wiefferink 2016-08-28 22:45:20 +02:00
parent f8ed3654fd
commit 93809f27fc
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AreaShop/src/main/java/me/wiefferink/areashop/events/askandnotify/AddFriendEvent.java → AreaShop/src/main/java/me/wiefferink/areashop/events/askandnotify/AddedFriendEvent.java
View File

@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender;
/**
* Broadcasted when a friend is being added to a region
*/
public class AddFriendEvent extends CancellableRegionEvent<GeneralRegion> {
public class AddedFriendEvent extends CancellableRegionEvent<GeneralRegion> {
private OfflinePlayer friend;
private CommandSender by;
@ -19,7 +19,7 @@ public class AddFriendEvent extends CancellableRegionEvent<GeneralRegion> {
* @param friend The friend that is about to be added
* @param by The CommandSender that is adding the friend, or null if none
*/
public AddFriendEvent(GeneralRegion region, OfflinePlayer friend, CommandSender by) {
public AddedFriendEvent(GeneralRegion region, OfflinePlayer friend, CommandSender by) {
super(region);
this.friend = friend;
this.by = by;

4
AreaShop/src/main/java/me/wiefferink/areashop/events/askandnotify/DeleteFriendEvent.java → AreaShop/src/main/java/me/wiefferink/areashop/events/askandnotify/DeletedFriendEvent.java
View File

@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender;
/**
* Broadcasted when a friend is being added to a region
*/
public class DeleteFriendEvent extends CancellableRegionEvent<GeneralRegion> {
public class DeletedFriendEvent extends CancellableRegionEvent<GeneralRegion> {
private OfflinePlayer friend;
private CommandSender by;
@ -19,7 +19,7 @@ public class DeleteFriendEvent extends CancellableRegionEvent<GeneralRegion> {
* @param friend The friend that is about to be added
* @param by The CommandSender that is adding the friend, or null if none
*/
public DeleteFriendEvent(GeneralRegion region, OfflinePlayer friend, CommandSender by) {
public DeletedFriendEvent(GeneralRegion region, OfflinePlayer friend, CommandSender by) {
super(region);
this.friend = friend;
this.by = by;

4
AreaShop/src/main/java/me/wiefferink/areashop/events/notify/RemovedRegionEvent.java → AreaShop/src/main/java/me/wiefferink/areashop/events/notify/DeletedRegionEvent.java
View File

@ -6,13 +6,13 @@ import me.wiefferink.areashop.regions.GeneralRegion;
/**
* Broadcasted when a region has been removed from AreaShop
*/
public class RemovedRegionEvent extends NotifyRegionEvent<GeneralRegion> {
public class DeletedRegionEvent extends NotifyRegionEvent<GeneralRegion> {
/**
* Constructor
* @param region The region that has been removed
*/
public RemovedRegionEvent(GeneralRegion region) {
public DeletedRegionEvent(GeneralRegion region) {
super(region);
}
}

16
AreaShop/src/main/java/me/wiefferink/areashop/features/DebugFeature.java
View File

@ -3,8 +3,8 @@ package me.wiefferink.areashop.features;
import me.wiefferink.areashop.AreaShop;
import me.wiefferink.areashop.Utils;
import me.wiefferink.areashop.events.ask.*;
import me.wiefferink.areashop.events.askandnotify.AddFriendEvent;
import me.wiefferink.areashop.events.askandnotify.DeleteFriendEvent;
import me.wiefferink.areashop.events.askandnotify.AddedFriendEvent;
import me.wiefferink.areashop.events.askandnotify.DeletedFriendEvent;
import me.wiefferink.areashop.events.notify.*;
import org.bukkit.event.EventHandler;
@ -71,17 +71,17 @@ public class DebugFeature extends Feature {
}
@EventHandler
public void removedRegion(RemovedRegionEvent event) {
AreaShop.debug("RemovedRegionEvent: "+event.getRegion().getName());
public void removedRegion(DeletedRegionEvent event) {
AreaShop.debug("DeletedRegionEvent: "+event.getRegion().getName());
}
@EventHandler
public void addedFriend(AddFriendEvent event) {
AreaShop.debug("AddFriendEvent: region "+event.getRegion().getName()+", "+event.getFriend().getName()+" by "+(event.getBy() == null ? "<nobody>" : event.getBy().getName()));
public void addedFriend(AddedFriendEvent event) {
AreaShop.debug("AddedFriendEvent: region "+event.getRegion().getName()+", "+event.getFriend().getName()+" by "+(event.getBy() == null ? "<nobody>" : event.getBy().getName()));
}
@EventHandler
public void deleteFriend(DeleteFriendEvent event) {
AreaShop.debug("DeleteFriendEvent: region "+event.getRegion().getName()+", "+event.getFriend().getName()+" by "+(event.getBy() == null ? "<nobody>" : event.getBy().getName()));
public void deleteFriend(DeletedFriendEvent event) {
AreaShop.debug("DeletedFriendEvent: region "+event.getRegion().getName()+", "+event.getFriend().getName()+" by "+(event.getBy() == null ? "<nobody>" : event.getBy().getName()));
}
}

8
AreaShop/src/main/java/me/wiefferink/areashop/features/FriendsFeature.java
View File

@ -1,7 +1,7 @@
package me.wiefferink.areashop.features;
import me.wiefferink.areashop.events.askandnotify.AddFriendEvent;
import me.wiefferink.areashop.events.askandnotify.DeleteFriendEvent;
import me.wiefferink.areashop.events.askandnotify.AddedFriendEvent;
import me.wiefferink.areashop.events.askandnotify.DeletedFriendEvent;
import me.wiefferink.areashop.regions.GeneralRegion;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
@ -25,7 +25,7 @@ public class FriendsFeature extends Feature {
*/
public boolean addFriend(UUID player, CommandSender by) {
// Fire and check event
AddFriendEvent event = new AddFriendEvent(region, Bukkit.getOfflinePlayer(player), by);
AddedFriendEvent event = new AddedFriendEvent(region, Bukkit.getOfflinePlayer(player), by);
Bukkit.getPluginManager().callEvent(event);
if(event.isCancelled()) {
plugin.message(by, "general-cancelled", event.getReason(), this);
@ -47,7 +47,7 @@ public class FriendsFeature extends Feature {
*/
public boolean deleteFriend(UUID player, CommandSender by) {
// Fire and check event
DeleteFriendEvent event = new DeleteFriendEvent(region, Bukkit.getOfflinePlayer(player), by);
DeletedFriendEvent event = new DeletedFriendEvent(region, Bukkit.getOfflinePlayer(player), by);
Bukkit.getPluginManager().callEvent(event);
if(event.isCancelled()) {
plugin.message(by, "general-cancelled", event.getReason(), this);

6
AreaShop/src/main/java/me/wiefferink/areashop/managers/FileManager.java
View File

@ -7,7 +7,7 @@ import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import me.wiefferink.areashop.AreaShop;
import me.wiefferink.areashop.Utils;
import me.wiefferink.areashop.events.notify.AddedRegionEvent;
import me.wiefferink.areashop.events.notify.RemovedRegionEvent;
import me.wiefferink.areashop.events.notify.DeletedRegionEvent;
import me.wiefferink.areashop.regions.BuyRegion;
import me.wiefferink.areashop.regions.GeneralRegion;
import me.wiefferink.areashop.regions.GeneralRegion.RegionEvent;
@ -335,7 +335,7 @@ public class FileManager {
result = true;
// Broadcast event
Bukkit.getPluginManager().callEvent(new RemovedRegionEvent(rent));
Bukkit.getPluginManager().callEvent(new DeletedRegionEvent(rent));
// Run commands
rent.runEventCommands(RegionEvent.DELETED, false);
@ -391,7 +391,7 @@ public class FileManager {
result = true;
// Broadcast event
Bukkit.getPluginManager().callEvent(new RemovedRegionEvent(buy));
Bukkit.getPluginManager().callEvent(new DeletedRegionEvent(buy));
// Run commands
buy.runEventCommands(RegionEvent.DELETED, false);