mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 10:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #695 from xIRoXaSx/master

Browse Source 
Implementation of #692
This commit is contained in:
Brian Fopiano 2021-12-27 12:46:46 -08:00 committed by GitHub
commit 876f1231ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/volmit/iris/engine/object/IrisCommand.java
View File

@ -28,6 +28,7 @@ import lombok.NoArgsConstructor;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World;
@Snippet("command") @Snippet("command")
@Accessors(chain = true) @Accessors(chain = true)
@ -49,8 +50,21 @@ public class IrisCommand {
@Desc("The delay between repeats, in server ticks (by default 100, so 5 seconds)") @Desc("The delay between repeats, in server ticks (by default 100, so 5 seconds)")
private long repeatDelay = 100; private long repeatDelay = 100;
@Desc("The block of 24 hour time in which the command should execute.")
private IrisTimeBlock timeBlock = new IrisTimeBlock();
@Desc("The weather that is required for the command to execute.")
private IrisWeather weather = IrisWeather.ANY;
public boolean isValid(World world) {
return timeBlock.isWithin(world) && weather.is(world);
}
public void run(Location at) { public void run(Location at) {
if (!isValid(at.getWorld())) {
return;
}
for (String command : commands) { for (String command : commands) {
command = (command.startsWith("/") ? command.replaceFirst("/", "") : command) command = (command.startsWith("/") ? command.replaceFirst("/", "") : command)
.replaceAll("\\Q{x}\\E", String.valueOf(at.getBlockX())) .replaceAll("\\Q{x}\\E", String.valueOf(at.getBlockX()))
@ -64,4 +78,4 @@ public class IrisCommand {
} }
} }
} }
} }