mirror of
https://github.com/ColdeZhang/Dominion.git
synced 2024-10-19 03:26:40 +08:00
提高1.20.x兼容性
This commit is contained in:
parent
4a8ae8b568
commit
0ad56e3c0b
@ -1,11 +1,10 @@
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("java")
|
id("java")
|
||||||
id("com.github.johnrengelman.shadow") version "8.1.1"
|
id("com.github.johnrengelman.shadow") version "8.1.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "cn.lunadeer"
|
group = "cn.lunadeer"
|
||||||
version = "1.44.2-beta"
|
version = "1.44.3-beta"
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
|
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
|
||||||
|
@ -4,6 +4,7 @@ import cn.lunadeer.dominion.Cache;
|
|||||||
import cn.lunadeer.dominion.dtos.DominionDTO;
|
import cn.lunadeer.dominion.dtos.DominionDTO;
|
||||||
import cn.lunadeer.dominion.dtos.Flag;
|
import cn.lunadeer.dominion.dtos.Flag;
|
||||||
import cn.lunadeer.dominion.dtos.PlayerDTO;
|
import cn.lunadeer.dominion.dtos.PlayerDTO;
|
||||||
|
import cn.lunadeer.minecraftpluginutils.Common;
|
||||||
import cn.lunadeer.minecraftpluginutils.Notification;
|
import cn.lunadeer.minecraftpluginutils.Notification;
|
||||||
import cn.lunadeer.minecraftpluginutils.Teleport;
|
import cn.lunadeer.minecraftpluginutils.Teleport;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
@ -316,7 +317,8 @@ public class PlayerEvents implements Listener {
|
|||||||
@EventHandler(priority = EventPriority.HIGHEST) // crafter
|
@EventHandler(priority = EventPriority.HIGHEST) // crafter
|
||||||
public void onCrafterOpen(InventoryOpenEvent event) {
|
public void onCrafterOpen(InventoryOpenEvent event) {
|
||||||
Inventory inv = event.getInventory();
|
Inventory inv = event.getInventory();
|
||||||
if (inv.getType() != InventoryType.CRAFTER) {
|
// InventoryType.CRAFTER;
|
||||||
|
if (!inv.getType().name().contains("CRAFTER")) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!(event.getPlayer() instanceof Player bukkitPlayer)) {
|
if (!(event.getPlayer() instanceof Player bukkitPlayer)) {
|
||||||
@ -615,10 +617,16 @@ public class PlayerEvents implements Listener {
|
|||||||
Teleport.doTeleportSafely(player, to).thenAccept((success) -> {
|
Teleport.doTeleportSafely(player, to).thenAccept((success) -> {
|
||||||
if (!success) {
|
if (!success) {
|
||||||
Notification.warn(player, "传送失败,你将被传送到复活点");
|
Notification.warn(player, "传送失败,你将被传送到复活点");
|
||||||
player.teleportAsync(player.getBedSpawnLocation() == null ?
|
Location bed = player.getBedSpawnLocation();
|
||||||
player.getWorld().getSpawnLocation() :
|
if (bed == null) {
|
||||||
player.getBedSpawnLocation()
|
bed = player.getWorld().getSpawnLocation();
|
||||||
, PlayerTeleportEvent.TeleportCause.PLUGIN);
|
}
|
||||||
|
if (Common.isPaper()) {
|
||||||
|
player.teleportAsync(bed, PlayerTeleportEvent.TeleportCause.PLUGIN);
|
||||||
|
} else {
|
||||||
|
player.teleport(bed, PlayerTeleportEvent.TeleportCause.PLUGIN);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user