Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2024-11-09 20:21:41 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2019-10-15 10:23:22 -04:00
commit e223322d4d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
variables:
name: "EpicHoppers"
path: "/builds/$CI_PROJECT_PATH"
version: "4.3.3"
version: "4.3.4"
build:
stage: build

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

@ -165,16 +165,15 @@ public class GUIOverview extends Gui {
if (ii == 0) {
setButton(slot, hook,
(event) -> {
hopper.clearLinkedBlocks();
if (event.clickType == ClickType.RIGHT) {
plugin.getLocale().getMessage("event.hopper.desync").sendPrefixedMessage(player);
hopper.clearLinkedBlocks();
} else {
if (hopper.getLastPlayerOpened() != null && !hopper.getLastPlayerOpened().equals(player.getUniqueId())) {
plugin.getLocale().getMessage("event.hopper.syncdidnotplace").sendPrefixedMessage(player);
return;
}
plugin.getPlayerDataManager().getPlayerData(player).setSyncType(SyncType.REGULAR);
hopper.clearLinkedBlocks();
plugin.getLocale().getMessage("event.hopper.syncnext").sendPrefixedMessage(player);
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();
if (level.getLinkAmount() > 1) {
if (getLinkedBlocks().size() == level.getLinkAmount()) {
if (linkedBlocks.size() >= level.getLinkAmount()) {
instance.getLocale().getMessage("event.hopper.syncdone").sendPrefixedMessage(player);
cancelSync(player);
return;
}
instance.getLocale().getMessage("event.hopper.syncsuccessmore")
.processPlaceholder("amount", level.getLinkAmount() - getLinkedBlocks().size())
.processPlaceholder("amount", level.getLinkAmount() - linkedBlocks.size())
.sendPrefixedMessage(player);
return;
}