Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-10-01 16:17:30 +02:00
Code Issues Projects Releases Wiki Activity

Fixed duplicated code in flag events (added abstract FlagChangeEvent)

Browse Source
This commit is contained in:
Florian CUNY 2019-08-13 10:37:55 +02:00
parent 98e6468386
commit 90fd6a625f
4 changed files with 46 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/world/bentobox/bentobox/api/events/flags/FlagChangeEvent.java Normal file
View File

@ -0,0 +1,40 @@
package world.bentobox.bentobox.api.events.flags;
import world.bentobox.bentobox.api.events.BentoBoxEvent;
import world.bentobox.bentobox.api.flags.Flag;
import java.util.UUID;
/**
*
* @author Poslovitch
* @since 1.6.0
*/
public abstract class FlagChangeEvent extends BentoBoxEvent {
private final UUID player;
private final Flag editedFlag;
/**
* @param player - player changing the flag
* @param editedFlag - flag that has changed
*/
public FlagChangeEvent(UUID player, Flag editedFlag) {
this.player = player;
this.editedFlag = editedFlag;
}
/**
* @return the player
*/
public UUID getPlayer() {
return player;
}
/**
* @return the editedFlag
*/
public Flag getEditedFlag() {
return editedFlag;
}
}

22
src/main/java/world/bentobox/bentobox/api/events/flags/FlagProtectionChangeEvent.java
View File

@ -2,7 +2,6 @@ package world.bentobox.bentobox.api.events.flags;
import java.util.UUID;
import world.bentobox.bentobox.api.events.BentoBoxEvent;
import world.bentobox.bentobox.api.flags.Flag;
import world.bentobox.bentobox.database.objects.Island;
@ -10,11 +9,9 @@ import world.bentobox.bentobox.database.objects.Island;
* @author tastybento
* @since 1.6.0
*/
public class FlagProtectionChangeEvent extends BentoBoxEvent {
public class FlagProtectionChangeEvent extends FlagChangeEvent {
private final Island island;
private final UUID player;
private final Flag editedFlag;
private final int setTo;
/**
@ -25,9 +22,8 @@ public class FlagProtectionChangeEvent extends BentoBoxEvent {
* @param setTo - value it was set to
*/
public FlagProtectionChangeEvent(Island island, UUID player, Flag editedFlag, int setTo) {
super(player, editedFlag);
this.island = island;
this.player = player;
this.editedFlag = editedFlag;
this.setTo = setTo;
}
@ -38,20 +34,6 @@ public class FlagProtectionChangeEvent extends BentoBoxEvent {
return island;
}
/**
* @return the player
*/
public UUID getPlayer() {
return player;
}
/**
* @return the editedFlag
*/
public Flag getEditedFlag() {
return editedFlag;
}
/**
* @return the setTo
*/

22
src/main/java/world/bentobox/bentobox/api/events/flags/FlagSettingChangeEvent.java
View File

@ -2,7 +2,6 @@ package world.bentobox.bentobox.api.events.flags;
import java.util.UUID;
import world.bentobox.bentobox.api.events.BentoBoxEvent;
import world.bentobox.bentobox.api.flags.Flag;
import world.bentobox.bentobox.database.objects.Island;
@ -10,11 +9,9 @@ import world.bentobox.bentobox.database.objects.Island;
* @author tastybento
* @since 1.6.0
*/
public class FlagSettingChangeEvent extends BentoBoxEvent {
public class FlagSettingChangeEvent extends FlagChangeEvent {
private final Island island;
private final UUID player;
private final Flag editedFlag;
private final boolean setTo;
/**
@ -25,9 +22,8 @@ public class FlagSettingChangeEvent extends BentoBoxEvent {
* @param setTo - value it was set to
*/
public FlagSettingChangeEvent(Island island, UUID player, Flag editedFlag, boolean setTo) {
super(player, editedFlag);
this.island = island;
this.player = player;
this.editedFlag = editedFlag;
this.setTo = setTo;
}
@ -38,20 +34,6 @@ public class FlagSettingChangeEvent extends BentoBoxEvent {
return island;
}
/**
* @return the player
*/
public UUID getPlayer() {
return player;
}
/**
* @return the editedFlag
*/
public Flag getEditedFlag() {
return editedFlag;
}
/**
* @return the setTo
*/

23
src/main/java/world/bentobox/bentobox/api/events/flags/FlagWorldSettingChangeEvent.java
View File

@ -4,18 +4,15 @@ import java.util.UUID;
import org.bukkit.World;
import world.bentobox.bentobox.api.events.BentoBoxEvent;
import world.bentobox.bentobox.api.flags.Flag;
/**
* @author tastybento
* @since 1.6.0
*/
public class FlagWorldSettingChangeEvent extends BentoBoxEvent {
public class FlagWorldSettingChangeEvent extends FlagChangeEvent {
private final World world;
private final UUID player;
private final Flag editedFlag;
private final boolean setTo;
/**
@ -26,9 +23,8 @@ public class FlagWorldSettingChangeEvent extends BentoBoxEvent {
* @param setTo - value it was set to
*/
public FlagWorldSettingChangeEvent(World world, UUID player, Flag editedFlag, boolean setTo) {
super(player, editedFlag);
this.world = world;
this.player = player;
this.editedFlag = editedFlag;
this.setTo = setTo;
}
@ -39,21 +35,6 @@ public class FlagWorldSettingChangeEvent extends BentoBoxEvent {
return world;
}
/**
* @return the player
*/
public UUID getPlayer() {
return player;
}
/**
* @return the editedFlag
*/
public Flag getEditedFlag() {
return editedFlag;
}
/**
* @return the setTo
*/