Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2025-02-18 12:51:31 +01:00
Code Issues Projects Releases Wiki Activity

Fix Link canceling issues.

Browse Source
This commit is contained in:
Brianna 2019-10-15 10:22:58 -04:00
parent 59ed48b361
commit 239b0f967c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/songoda/epichoppers/gui/GUIOverview.java
View File

@ -165,16 +165,15 @@ public class GUIOverview extends Gui {
if (ii == 0) { if (ii == 0) {
setButton(slot, hook, setButton(slot, hook,
(event) -> { (event) -> {
hopper.clearLinkedBlocks();
if (event.clickType == ClickType.RIGHT) { if (event.clickType == ClickType.RIGHT) {
plugin.getLocale().getMessage("event.hopper.desync").sendPrefixedMessage(player); plugin.getLocale().getMessage("event.hopper.desync").sendPrefixedMessage(player);
hopper.clearLinkedBlocks();
} else { } else {
if (hopper.getLastPlayerOpened() != null && !hopper.getLastPlayerOpened().equals(player.getUniqueId())) { if (hopper.getLastPlayerOpened() != null && !hopper.getLastPlayerOpened().equals(player.getUniqueId())) {
plugin.getLocale().getMessage("event.hopper.syncdidnotplace").sendPrefixedMessage(player); plugin.getLocale().getMessage("event.hopper.syncdidnotplace").sendPrefixedMessage(player);
return; return;
} }
plugin.getPlayerDataManager().getPlayerData(player).setSyncType(SyncType.REGULAR); plugin.getPlayerDataManager().getPlayerData(player).setSyncType(SyncType.REGULAR);
hopper.clearLinkedBlocks();
plugin.getLocale().getMessage("event.hopper.syncnext").sendPrefixedMessage(player); plugin.getLocale().getMessage("event.hopper.syncnext").sendPrefixedMessage(player);
if (level.getLinkAmount() > 1) if (level.getLinkAmount() > 1)

5
src/main/java/com/songoda/epichoppers/hopper/Hopper.java
View File

@ -156,12 +156,13 @@ public class Hopper {
this.lastPlayerOpened = player.getUniqueId(); this.lastPlayerOpened = player.getUniqueId();
if (level.getLinkAmount() > 1) { if (level.getLinkAmount() > 1) {
if (getLinkedBlocks().size() == level.getLinkAmount()) { if (linkedBlocks.size() >= level.getLinkAmount()) {
instance.getLocale().getMessage("event.hopper.syncdone").sendPrefixedMessage(player); instance.getLocale().getMessage("event.hopper.syncdone").sendPrefixedMessage(player);
cancelSync(player);
return; return;
} }
instance.getLocale().getMessage("event.hopper.syncsuccessmore") instance.getLocale().getMessage("event.hopper.syncsuccessmore")
.processPlaceholder("amount", level.getLinkAmount() - getLinkedBlocks().size()) .processPlaceholder("amount", level.getLinkAmount() - linkedBlocks.size())
.sendPrefixedMessage(player); .sendPrefixedMessage(player);
return; return;
} }