Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-09-25 13:22:52 +02:00
Code Issues Projects Releases Wiki Activity

Adds PreCreateEvent for API

Browse Source
This commit is contained in:
tastybento 2020-10-12 14:07:47 -07:00
parent b024d0cc8b
commit f09ea1ffef
3 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/world/bentobox/bentobox/api/events/island/IslandEvent.java
View File

@ -50,6 +50,12 @@ public class IslandEvent extends IslandBaseEvent {
* @since 1.1
*/
BAN,
/**
* Fired when a player tries to create a new island. If canceled will
* proceed no further.
* @since 1.15.1
*/
PRECREATE,
/**
* Called when a player has been allocated a new island spot
* but before the island itself has been pasted or the player teleported.
@ -220,6 +226,18 @@ public class IslandEvent extends IslandBaseEvent {
}
}
/**
* Fired when attempting to make a new island.
* May be cancelled. No island object exists at this point.
* @since 1.15.1
*/
public static class IslandPreCreateEvent extends IslandBaseEvent {
private IslandPreCreateEvent(UUID player) {
// Final variables have to be declared in the constructor
super(null, player, false, null);
}
}
/**
* Fired when an island is going to be created.
* May be cancelled.
@ -681,6 +699,10 @@ public class IslandEvent extends IslandBaseEvent {
IslandBanEvent ban = new IslandBanEvent(island, player, admin, location);
Bukkit.getPluginManager().callEvent(ban);
return ban;
case PRECREATE:
IslandPreCreateEvent precreate = new IslandPreCreateEvent(player);
Bukkit.getPluginManager().callEvent(precreate);
return precreate;
case CREATE:
IslandCreateEvent create = new IslandCreateEvent(island, player, admin, location, blueprintBundle);
Bukkit.getPluginManager().callEvent(create);

10
src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java
View File

@ -48,7 +48,15 @@ public class NewIsland {
if (this.locationStrategy == null) {
this.locationStrategy = new DefaultNewIslandLocationStrategy();
}
// Fire pre-create event
IslandBaseEvent event = IslandEvent.builder()
.involvedPlayer(user.getUniqueId())
.reason(Reason.PRECREATE)
.build();
if (event.isCancelled()) {
// Do nothing
return;
}
newIsland(builder.oldIsland2);
}

17
src/test/java/world/bentobox/bentobox/managers/island/NewIslandTest.java
View File

@ -6,6 +6,7 @@ import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ -197,7 +198,7 @@ public class NewIslandTest {
verify(im).save(eq(island));
verify(island).setFlagsDefaults();
verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class));
verify(builder).build();
verify(builder, times(2)).build();
verify(bpb).getUniqueId();
verify(ice).getBlueprintBundle();
verify(pm).setDeaths(eq(world), eq(uuid), eq(0));
@ -205,7 +206,7 @@ public class NewIslandTest {
verify(pm).clearHomeLocations(eq(world), any(UUID.class));
verify(island).setProtectionRange(eq(20));
}
/**
* Test method for {@link world.bentobox.bentobox.managers.island.NewIsland#builder()}.
* @throws Exception
@ -218,7 +219,7 @@ public class NewIslandTest {
verify(im).save(eq(island));
verify(island).setFlagsDefaults();
verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class));
verify(builder).build();
verify(builder, times(2)).build();
verify(bpb).getUniqueId();
verify(ice, never()).getBlueprintBundle();
verify(ire).getBlueprintBundle();
@ -238,7 +239,7 @@ public class NewIslandTest {
verify(im).save(eq(island));
verify(island).setFlagsDefaults();
verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class));
verify(builder).build();
verify(builder, times(2)).build();
verify(bpb).getUniqueId();
verify(ice).getBlueprintBundle();
verify(pm).setDeaths(eq(world), eq(uuid), eq(0));
@ -257,7 +258,7 @@ public class NewIslandTest {
verify(im).save(eq(island));
verify(island).setFlagsDefaults();
verify(bpm).paste(eq(addon), eq(island), eq(NAME), any(Runnable.class));
verify(builder).build();
verify(builder, times(2)).build();
verify(bpb).getUniqueId();
verify(ice).getBlueprintBundle();
verify(pm).setDeaths(eq(world), eq(uuid), eq(0));
@ -277,7 +278,7 @@ public class NewIslandTest {
verify(im).save(eq(island));
verify(island).setFlagsDefaults();
verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class));
verify(builder).build();
verify(builder, times(2)).build();
verify(bpb).getUniqueId();
verify(ice).getBlueprintBundle();
verify(pm).setDeaths(eq(world), eq(uuid), eq(0));
@ -300,7 +301,7 @@ public class NewIslandTest {
verify(im).save(eq(island));
verify(island).setFlagsDefaults();
verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class));
verify(builder).build();
verify(builder, times(2)).build();
verify(bpb).getUniqueId();
verify(ice).getBlueprintBundle();
verify(pm).setDeaths(eq(world), eq(uuid), eq(0));
@ -323,7 +324,7 @@ public class NewIslandTest {
verify(im).save(eq(island));
verify(island).setFlagsDefaults();
verify(scheduler).runTask(any(BentoBox.class), any(Runnable.class));
verify(builder).build();
verify(builder, times(2)).build();
verify(bpb).getUniqueId();
verify(ice).getBlueprintBundle();
verify(pm).setDeaths(eq(world), eq(uuid), eq(0));