KnarCraft/MiniGames
1
0
Fork 0
mirror of https://github.com/SunNetservers/MiniGames.git synced 2025-09-17 11:27:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #36

Browse Source
This commit is contained in:
Kristian Knarvik
2024-04-22 12:41:55 +02:00
parent d124c0948b
commit a1f76bcfc2
5 changed files with 60 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/knarcraft/minigames/arena/dropper/DropperArena.java
View File

@@ -263,7 +263,7 @@ public class DropperArena implements Arena {
* @param newLocation <p>The new spawn location</p>
* @return <p>True if successfully updated</p>
*/
public boolean setSpawnLocation(@NotNull Location newLocation) {
public boolean setSpawnLocation(@Nullable Location newLocation) {
if (isInvalid(newLocation)) {
return false;
} else {
@@ -279,7 +279,7 @@ public class DropperArena implements Arena {
* @param newLocation <p>The new exit location</p>
* @return <p>True if successfully updated</p>
*/
public boolean setExitLocation(@NotNull Location newLocation) {
public boolean setExitLocation(@Nullable Location newLocation) {
if (isInvalid(newLocation)) {
return false;
} else {

19
src/main/java/net/knarcraft/minigames/arena/parkour/ParkourArena.java
View File

@@ -356,7 +356,7 @@ public class ParkourArena implements Arena {
* @param newLocation <p>The new spawn location</p>
* @return <p>True if successfully updated</p>
*/
public boolean setSpawnLocation(@NotNull Location newLocation) {
public boolean setSpawnLocation(@Nullable Location newLocation) {
if (isInvalid(newLocation)) {
return false;
} else {
@@ -372,7 +372,7 @@ public class ParkourArena implements Arena {
* @param newLocation <p>The new exit location</p>
* @return <p>True if successfully updated</p>
*/
public boolean setExitLocation(@NotNull Location newLocation) {
public boolean setExitLocation(@Nullable Location newLocation) {
if (isInvalid(newLocation)) {
return false;
} else {
@@ -425,13 +425,18 @@ public class ParkourArena implements Arena {
* @param newLocation <p>The location players have to reach</p>
* @return <p>True if successfully changed</p>
*/
public boolean setWinLocation(@NotNull Location newLocation) {
if (isInvalid(newLocation)) {
return false;
} else {
public boolean setWinLocation(@Nullable Location newLocation) {
if (newLocation == null) {
// Un-set the win location, and fall back to the win block type
this.winLocation = null;
this.saveArena();
return true;
} else if (!isInvalid(newLocation)) {
this.winLocation = newLocation.clone();
this.saveArena();
return true;
} else {
return false;
}
}
@@ -485,7 +490,7 @@ public class ParkourArena implements Arena {
* @param checkpoint <p>The checkpoint to add</p>
* @return <p>True if successfully added</p>
*/
public boolean addCheckpoint(@NotNull Location checkpoint) {
public boolean addCheckpoint(@Nullable Location checkpoint) {
if (isInvalid(checkpoint)) {
return false;
}