Upstream/AxMinions
1
0
Fork 0
mirror of https://github.com/Artillex-Studios/AxMinions.git synced 2024-12-01 13:03:43 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't call MinionChestLinkEvent for unlink

Browse Source
This commit is contained in:
rudde 2024-04-30 12:53:44 +03:00
parent d478a3c4eb
commit 05b36a3669
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/src/main/kotlin/com/artillexstudios/axminions/listeners/LinkingListener.kt
View File

@ -29,6 +29,15 @@ class LinkingListener : Listener {
if (event.clickedBlock!!.type !in CONTAINERS) return if (event.clickedBlock!!.type !in CONTAINERS) return
if (!AxMinionsPlugin.integrations.getProtectionIntegration().canBuildAt(event.player, event.clickedBlock!!.location)) return if (!AxMinionsPlugin.integrations.getProtectionIntegration().canBuildAt(event.player, event.clickedBlock!!.location)) return
val minion = linking.remove(event.player) ?: return
event.isCancelled = true
if (minion.getLocation()
.distanceSquared(event.clickedBlock!!.location) > Config.MAX_LINKING_DISTANCE() * Config.MAX_LINKING_DISTANCE()
) {
event.player.sendMessage(StringUtils.formatToString(Messages.PREFIX() + Messages.LINK_FAIL()))
return
}
val linkEvent = MinionChestLinkEvent( val linkEvent = MinionChestLinkEvent(
linking.getValue(event.player), linking.getValue(event.player),
event.player, event.player,
@ -39,15 +48,6 @@ class LinkingListener : Listener {
return return
} }
val minion = linking.remove(event.player) ?: return
event.isCancelled = true
if (minion.getLocation()
.distanceSquared(event.clickedBlock!!.location) > Config.MAX_LINKING_DISTANCE() * Config.MAX_LINKING_DISTANCE()
) {
event.player.sendMessage(StringUtils.formatToString(Messages.PREFIX() + Messages.LINK_FAIL()))
return
}
event.player.sendMessage(StringUtils.formatToString(Messages.PREFIX() + Messages.LINK_SUCCESS())) event.player.sendMessage(StringUtils.formatToString(Messages.PREFIX() + Messages.LINK_SUCCESS()))
minion.setLinkedChest(event.clickedBlock!!.location) minion.setLinkedChest(event.clickedBlock!!.location)
} }