Fix issues with 1.13+
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
This commit is contained in:
parent
d3870731f4
commit
441382acdc
@ -30,6 +30,17 @@ public interface FPlayer extends EconomyParticipator {
|
|||||||
|
|
||||||
boolean hasNotificationsEnabled();
|
boolean hasNotificationsEnabled();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Used to determine if a player is in their faction's chest
|
||||||
|
* @return if player is in their faction's as a boolean
|
||||||
|
*/
|
||||||
|
boolean isInFactionsChest();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set if the player is inside of their faction's chest
|
||||||
|
*/
|
||||||
|
void setInFactionsChest(boolean b);
|
||||||
|
|
||||||
boolean isAlt();
|
boolean isAlt();
|
||||||
|
|
||||||
void setAlt(boolean alt);
|
void setAlt(boolean alt);
|
||||||
|
@ -19,7 +19,7 @@ public class AntiChestListener implements Listener {
|
|||||||
public void onInventoryClick(InventoryClickEvent e) {
|
public void onInventoryClick(InventoryClickEvent e) {
|
||||||
Player player = (Player) e.getWhoClicked();
|
Player player = (Player) e.getWhoClicked();
|
||||||
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
|
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
|
||||||
if (!e.getView().getTopInventory().getTitle().equalsIgnoreCase(FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title")))) return;
|
if (!fPlayer.isInFactionsChest()) return;
|
||||||
|
|
||||||
if (e.isCancelled()) return;
|
if (e.isCancelled()) return;
|
||||||
|
|
||||||
@ -49,7 +49,7 @@ public class AntiChestListener implements Listener {
|
|||||||
Player p = (Player) e.getWhoClicked();
|
Player p = (Player) e.getWhoClicked();
|
||||||
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(p);
|
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(p);
|
||||||
|
|
||||||
if (!e.getView().getTopInventory().getTitle().equalsIgnoreCase(FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title")))) return;
|
if (!fPlayer.isInFactionsChest()) return;
|
||||||
if (e.isCancelled()) return;
|
if (e.isCancelled()) return;
|
||||||
|
|
||||||
ItemStack dragged = e.getOldCursor();
|
ItemStack dragged = e.getOldCursor();
|
||||||
|
@ -30,6 +30,7 @@ public class CmdChest extends FCommand {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// This permission check is way too explicit but it's clean
|
// This permission check is way too explicit but it's clean
|
||||||
|
context.fPlayer.setInFactionsChest(true);
|
||||||
context.player.openInventory(context.faction.getChestInventory());
|
context.player.openInventory(context.faction.getChestInventory());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -791,8 +791,8 @@ public class FactionsPlayerListener implements Listener {
|
|||||||
@EventHandler
|
@EventHandler
|
||||||
public void onClose(InventoryCloseEvent e) {
|
public void onClose(InventoryCloseEvent e) {
|
||||||
FPlayer fme = FPlayers.getInstance().getById(e.getPlayer().getUniqueId().toString());
|
FPlayer fme = FPlayers.getInstance().getById(e.getPlayer().getUniqueId().toString());
|
||||||
if (fme.isInVault())
|
if (fme.isInVault()) fme.setInVault(false);
|
||||||
fme.setInVault(false);
|
if (fme.isInFactionsChest()) fme.setInFactionsChest(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
|
||||||
@ -1011,6 +1011,11 @@ public class FactionsPlayerListener implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@EventHandler
|
||||||
|
public void onDisconnect(PlayerQuitEvent e) {
|
||||||
|
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(e.getPlayer());
|
||||||
|
if (fPlayer.isInFactionsChest()) fPlayer.setInFactionsChest(false);
|
||||||
|
}
|
||||||
|
|
||||||
private static class InteractAttemptSpam {
|
private static class InteractAttemptSpam {
|
||||||
private int attempts = 0;
|
private int attempts = 0;
|
||||||
|
@ -41,6 +41,7 @@ import java.util.*;
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
public abstract class MemoryFPlayer implements FPlayer {
|
public abstract class MemoryFPlayer implements FPlayer {
|
||||||
|
public boolean inChest = false;
|
||||||
public boolean inVault = false;
|
public boolean inVault = false;
|
||||||
protected HashMap<String, Long> commandCooldown = new HashMap<>();
|
protected HashMap<String, Long> commandCooldown = new HashMap<>();
|
||||||
protected String factionId;
|
protected String factionId;
|
||||||
@ -963,6 +964,12 @@ public abstract class MemoryFPlayer implements FPlayer {
|
|||||||
isFlying = fly;
|
isFlying = fly;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isInFactionsChest() {
|
||||||
|
return inChest;
|
||||||
|
}
|
||||||
|
public void setInFactionsChest(boolean b) {
|
||||||
|
inChest = b;
|
||||||
|
}
|
||||||
public boolean isInVault() {
|
public boolean isInVault() {
|
||||||
return inVault;
|
return inVault;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user