zhangyuheng
/
Dominion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 104 Wiki Activity

新增了水晶爆炸保护
Java CI-CD with Maven / build (push) Failing after 3m25s Details

This commit is contained in:
zhangyuheng 2024-03-09 23:28:01 +08:00
parent e1a11cb9b7
commit be3fd701b1
8 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>cn.lunadeer</groupId>
<artifactId>Dominion</artifactId>
<version>1.11.8-beta</version>
<version>1.11.9-beta</version>
<packaging>jar</packaging>
<name>Dominion</name>

1
src/main/java/cn/lunadeer/dominion/Cache.java
View File

@ -6,7 +6,6 @@ import cn.lunadeer.dominion.utils.Notification;
import cn.lunadeer.dominion.utils.XLogger;
import net.kyori.adventure.text.Component;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;
import javax.annotation.Nullable;

5
src/main/java/cn/lunadeer/dominion/Commands.java
View File

@ -13,7 +13,10 @@ import org.bukkit.command.TabExecutor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static cn.lunadeer.dominion.commands.Helper.*;

7
src/main/java/cn/lunadeer/dominion/events/EnvironmentEvents.java
View File

@ -16,7 +16,6 @@ import org.bukkit.event.block.BlockIgniteEvent;
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.EntityDropItemEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.EntityInteractEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import java.util.Objects;
@ -27,7 +26,11 @@ public class EnvironmentEvents implements Listener {
@EventHandler(priority = EventPriority.HIGHEST) // creeper_explode
public void onEntityExplode(EntityExplodeEvent event) {
Entity entity = event.getEntity();
if (entity.getType() != EntityType.CREEPER && entity.getType() != EntityType.WITHER_SKULL) {
if (entity.getType() != EntityType.CREEPER
&& entity.getType() != EntityType.WITHER_SKULL
&& entity.getType() != EntityType.FIREBALL
&& entity.getType() != EntityType.ENDER_CRYSTAL
) {
return;
}
DominionDTO dom = Cache.instance.getDominion(event.getLocation());

1
src/main/java/cn/lunadeer/dominion/events/PlayerEvents.java
View File

@ -17,7 +17,6 @@ import org.bukkit.event.block.BlockIgniteEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityPlaceEvent;
import org.bukkit.event.entity.EntitySpawnEvent;
import org.bukkit.event.entity.ProjectileLaunchEvent;
import org.bukkit.event.inventory.InventoryOpenEvent;
import org.bukkit.event.inventory.InventoryType;

4
src/main/java/cn/lunadeer/dominion/tuis/DominionFlagInfo.java
View File

@ -140,11 +140,11 @@ public class DominionFlagInfo {
if (dominion.getCreeperExplode()) {
view.add(Line.create()
.append(Button.createGreen("☑", "/dominion set creeper_explode false " + dominion.getName() + " " + page))
.append("苦力怕/凋零头颅爆炸"));
.append("苦力怕/凋零头颅/水晶爆炸"));
} else {
view.add(Line.create()
.append(Button.createRed("☐", "/dominion set creeper_explode true " + dominion.getName() + " " + page))
.append("苦力怕/凋零头颅爆炸"));
.append("苦力怕/凋零头颅/水晶爆炸"));
}
if (dominion.getComparer()) {
view.add(Line.create()

4
src/main/java/cn/lunadeer/dominion/tuis/ListDominion.java
View File

@ -1,6 +1,5 @@
package cn.lunadeer.dominion.tuis;
import cn.lunadeer.dominion.utils.Notification;
import cn.lunadeer.dominion.utils.STUI.Button;
import cn.lunadeer.dominion.utils.STUI.Line;
import cn.lunadeer.dominion.utils.STUI.ListView;
@ -11,7 +10,8 @@ import org.bukkit.entity.Player;
import java.util.List;
import static cn.lunadeer.dominion.commands.Apis.playerOnly;
import static cn.lunadeer.dominion.commands.Helper.*;
import static cn.lunadeer.dominion.commands.Helper.playerAdminDominions;
import static cn.lunadeer.dominion.commands.Helper.playerOwnDominions;
import static cn.lunadeer.dominion.tuis.Apis.getPage;
public class ListDominion {

3
src/main/java/cn/lunadeer/dominion/tuis/PrivilegeInfo.java
View File

@ -11,7 +11,8 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import static cn.lunadeer.dominion.commands.Apis.playerOnly;
import static cn.lunadeer.dominion.tuis.Apis.*;
import static cn.lunadeer.dominion.tuis.Apis.getDominionNameArg_2;
import static cn.lunadeer.dominion.tuis.Apis.noAuthToManage;
public class PrivilegeInfo {
// /dominion privilege_info <玩家名称> [领地名称] [页码]