Upstream/EpicFarming
1
0
Fork 0
mirror of https://github.com/songoda/EpicFarming.git synced 2024-07-02 01:04:46 +02:00
Code Issues Projects Releases Wiki Activity

Auto stash before cherrypick of "fix"

Browse Source
This commit is contained in:
Brianna O'Keefe 2019-02-04 00:00:59 -05:00
parent 674abf314e
commit 81fddfa1a0
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/farming/EFarm.java
View File

@ -30,6 +30,8 @@ public class EFarm implements Farm {
private Inventory inventory;
private UUID placedBy;
private UUID viewing = null;
private long lastCached = 0;
private final List<Block> cachedCrops = new ArrayList<>();
@ -45,9 +47,13 @@ public class EFarm implements Farm {
if (!player.hasPermission("epicfarming.view"))
return;
if (viewing != null) return;
setupOverview(player);
player.openInventory(inventory);
this.viewing = player.getUniqueId();
PlayerData playerData = EpicFarmingPlugin.getInstance().getPlayerActionManager().getPlayerAction(player);
playerData.setFarm(this);
@ -282,6 +288,14 @@ public class EFarm implements Farm {
return false;
}
public UUID getViewing() {
return viewing;
}
public void setViewing(UUID viewing) {
this.viewing = viewing;
}
public void addCachedCrop(Block block) {
cachedCrops.add(block);
}

7
EpicFarming-Plugin/src/main/java/com/songoda/epicfarming/listeners/InventoryListeners.java
View File

@ -3,6 +3,7 @@ package com.songoda.epicfarming.listeners;
import com.songoda.epicfarming.EpicFarmingPlugin;
import com.songoda.epicfarming.api.farming.UpgradeType;
import com.songoda.epicfarming.farming.EFarm;
import com.songoda.epicfarming.player.PlayerActionManager;
import com.songoda.epicfarming.player.PlayerData;
import com.songoda.epicfarming.utils.Debugger;
import org.bukkit.entity.Player;
@ -58,6 +59,12 @@ public class InventoryListeners implements Listener {
@EventHandler
public void onClose(InventoryCloseEvent event) {
try {
PlayerData playerData = instance.getPlayerActionManager().getPlayerAction((Player)event.getPlayer());
if (playerData.getFarm() != null) {
playerData.getFarm().setViewing(null);
}
instance.getPlayerActionManager().getPlayerAction((Player)event.getPlayer()).setFarm(null);
} catch (Exception ex) {
Debugger.runReport(ex);