mirror/Dominion
2
0
Fork 0
mirror of https://github.com/ColdeZhang/Dominion.git synced 2024-10-18 16:26:42 +08:00
Code Issues Actions Packages Projects Releases 41 Wiki Activity

修复了在1.21中风弹的击退效果无法被拦截的漏洞 #17

Browse Source
This commit is contained in:
ZhangYuheng 2024-09-19 14:44:08 +08:00
parent 99405c3828
commit 72a5a84a65
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -7,7 +7,7 @@ plugins {
}
group = "cn.lunadeer"
version = "2.8.1-beta"
version = "2.8.2-beta"
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(21))

14
v1_21/src/main/java/cn/lunadeer/dominion/events_v1_21/PlayerEvents.java
View File

@ -7,6 +7,7 @@ import cn.lunadeer.dominion.dtos.PlayerDTO;
import cn.lunadeer.minecraftpluginutils.Common;
import cn.lunadeer.minecraftpluginutils.Notification;
import cn.lunadeer.minecraftpluginutils.Teleport;
import com.destroystokyo.paper.event.entity.EntityKnockbackByEntityEvent;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Tag;
@ -790,6 +791,19 @@ public class PlayerEvents implements Listener {
checkFlag(dom, Flag.SHOOT, player, event);
}
@EventHandler(priority = EventPriority.HIGHEST) // shoot - wind_charge knock back
public void onWindChargeKnockBack(EntityKnockbackByEntityEvent event) {
Entity entity = event.getHitBy();
if (!(entity instanceof WindCharge windCharge)) {
return;
}
if (!(windCharge.getShooter() instanceof Player player)) {
return;
}
DominionDTO dom = Cache.instance.getDominionByLoc(windCharge.getLocation());
checkFlag(dom, Flag.SHOOT, player, event);
}
@EventHandler(priority = EventPriority.HIGHEST) // trade
public void onTrade(InventoryOpenEvent event) {
if (event.getInventory().getType() != InventoryType.MERCHANT) {