mirror of
https://github.com/ColdeZhang/Dominion.git
synced 2024-10-19 00:36:40 +08:00
修复了错误的领地大小编辑上下方向错误
修复了在启动时无法自动在卫星地图显示区域问题
This commit is contained in:
parent
63364a677c
commit
f12f595090
2
pom.xml
2
pom.xml
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>cn.lunadeer</groupId>
|
<groupId>cn.lunadeer</groupId>
|
||||||
<artifactId>Dominion</artifactId>
|
<artifactId>Dominion</artifactId>
|
||||||
<version>1.4-beta</version>
|
<version>1.4.4-beta</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>Dominion</name>
|
<name>Dominion</name>
|
||||||
|
@ -5,6 +5,7 @@ import cn.lunadeer.dominion.events.PlayerEvents;
|
|||||||
import cn.lunadeer.dominion.events.SelectPointEvents;
|
import cn.lunadeer.dominion.events.SelectPointEvents;
|
||||||
import cn.lunadeer.dominion.utils.ConfigManager;
|
import cn.lunadeer.dominion.utils.ConfigManager;
|
||||||
import cn.lunadeer.dominion.utils.Database;
|
import cn.lunadeer.dominion.utils.Database;
|
||||||
|
import cn.lunadeer.dominion.utils.Time;
|
||||||
import cn.lunadeer.dominion.utils.XLogger;
|
import cn.lunadeer.dominion.utils.XLogger;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
@ -39,6 +40,8 @@ public final class Dominion extends JavaPlugin {
|
|||||||
XLogger.info(" | |__| | (_) | | | | | | | | | | | (_) | | | |");
|
XLogger.info(" | |__| | (_) | | | | | | | | | | | (_) | | | |");
|
||||||
XLogger.info(" |_____/ \\___/|_| |_| |_|_|_| |_|_|\\___/|_| |_|");
|
XLogger.info(" |_____/ \\___/|_| |_| |_|_|_| |_|_|\\___/|_| |_|");
|
||||||
XLogger.info(" ");
|
XLogger.info(" ");
|
||||||
|
|
||||||
|
Time.runLater(this, BlueMapConnect::render, 20 * 60);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -68,9 +68,9 @@ public class Apis {
|
|||||||
return BlockFace.EAST;
|
return BlockFace.EAST;
|
||||||
}
|
}
|
||||||
} else if (pitch > 45) {
|
} else if (pitch > 45) {
|
||||||
return BlockFace.UP;
|
|
||||||
} else {
|
|
||||||
return BlockFace.DOWN;
|
return BlockFace.DOWN;
|
||||||
|
} else {
|
||||||
|
return BlockFace.UP;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,11 @@
|
|||||||
package cn.lunadeer.dominion.utils;
|
package cn.lunadeer.dominion.utils;
|
||||||
|
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.plugin.Plugin;
|
||||||
|
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
public class Time {
|
public class Time {
|
||||||
|
|
||||||
@ -9,4 +13,49 @@ public class Time {
|
|||||||
// yyyy-MM-dd HH:mm:ss
|
// yyyy-MM-dd HH:mm:ss
|
||||||
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
|
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 尝试获取folia的调度器
|
||||||
|
*
|
||||||
|
* @return 是否成功
|
||||||
|
*/
|
||||||
|
private static boolean tryFolia() {
|
||||||
|
try {
|
||||||
|
Bukkit.getAsyncScheduler();
|
||||||
|
return true;
|
||||||
|
} catch (Throwable ignored) {
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Boolean IS_FOLIA = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断是否是folia核心
|
||||||
|
*
|
||||||
|
* @return 是否是folia核心
|
||||||
|
*/
|
||||||
|
public static Boolean isFolia() {
|
||||||
|
if (IS_FOLIA == null) IS_FOLIA = tryFolia();
|
||||||
|
return IS_FOLIA;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 定时异步任务
|
||||||
|
*
|
||||||
|
* @param plugin 插件
|
||||||
|
* @param runnable 任务
|
||||||
|
* @param ticks 间隔
|
||||||
|
*/
|
||||||
|
public static void runAtFixedRateAsync(Plugin plugin, Runnable runnable, int ticks) {
|
||||||
|
if (isFolia())
|
||||||
|
Bukkit.getAsyncScheduler().runAtFixedRate(plugin, (task) -> runnable.run(), ticks / 20, ticks / 20, TimeUnit.SECONDS);
|
||||||
|
else Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, runnable, ticks, ticks);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void runLater(Plugin plugin, Runnable runnable, int ticks) {
|
||||||
|
if (isFolia())
|
||||||
|
Bukkit.getAsyncScheduler().runDelayed(plugin, (task) -> runnable.run(), ticks / 20, TimeUnit.SECONDS);
|
||||||
|
else Bukkit.getScheduler().runTaskLater(plugin, runnable, ticks);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user