mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-05 23:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into DecreeCommands

Browse Source
This commit is contained in:
CocoTheOwner
2021-08-19 09:54:55 +02:00
parent 6abef569e8 957de5d6f7
commit baf76c51f9
29 changed files with 438 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/volmit/iris/util/plugin/IrisService.java
View File

@@ -18,10 +18,16 @@
package com.volmit.iris.util.plugin;
import com.volmit.iris.Iris;
import org.bukkit.event.Listener;
public interface IrisService extends Listener {
void onEnable();
void onDisable();
default void postShutdown(Runnable r)
{
Iris.instance.postShutdown(r);
}
}

2
src/main/java/com/volmit/iris/util/plugin/VolmitSender.java
View File

@@ -226,7 +226,7 @@ public class VolmitSender implements CommandSender {
}
public static String pulse(double speed) {
return Form.f(invertSpread((((getTick() * 15D * speed) % 1000D) / 1000D)), 3).replaceAll("\\Q,\\E", ".");
return Form.f(invertSpread((((getTick() * 15D * speed) % 1000D) / 1000D)), 3).replaceAll("\\Q,\\E", ".").replaceAll("\\Q?\\E", "-");
}
public static double invertSpread(double v) {