Upstream/Auction-House
1
0
Fork 0
mirror of https://github.com/kiranhart/Auction-House.git synced 2024-11-26 06:05:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

🌠 fix meteor client issues (off hand swap, and .item head)

Browse Source 
Took 7 minutes
This commit is contained in:
Kiran Hart 2023-03-11 17:37:23 -05:00
parent d30642daaa
commit 4b536fa1a8
No known key found for this signature in database
GPG Key ID: 5F36C7BC79D3EBC3
1 changed files with 23 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/main/java/ca/tweetzy/auctionhouse/listeners/PlayerListeners.java
View File

@ -35,6 +35,7 @@ import org.bukkit.Bukkit;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.Chest; import org.bukkit.block.Chest;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -43,6 +44,7 @@ import org.bukkit.event.Listener;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.event.inventory.PrepareAnvilEvent;
import org.bukkit.event.inventory.PrepareItemCraftEvent; import org.bukkit.event.inventory.PrepareItemCraftEvent;
import org.bukkit.event.player.*; import org.bukkit.event.player.*;
@ -60,38 +62,6 @@ import java.util.List;
*/ */
public class PlayerListeners implements Listener { public class PlayerListeners implements Listener {
// @EventHandler
// public void onUserDeath(final PlayerDeathEvent event) {
// final Player player = event.getEntity().getPlayer();
// if (player == null) return;
// if (event.getDrops().isEmpty()) return;
//
// // get the death location
// final Location deathLocation = player.getLocation();
//
// // get the block at the location
// final Block blockAtDeath = deathLocation.getBlock();
//
// // if the block at death location is not a chest, then set as chest
// if (blockAtDeath.getType() != Material.CHEST)
// blockAtDeath.setType(Material.CHEST);
//
// final Chest chest = (Chest) blockAtDeath.getState();
//
// for (ItemStack itemToFill : player.getInventory().getContents()) {
// if (itemToFill == null) continue;
//
// // check if full otherwise just drop to ground
// if (chest.getInventory().firstEmpty() == -1)
// chest.getWorld().dropItemNaturally(deathLocation, itemToFill);
// else
// chest.getInventory().addItem(itemToFill);
// }
//
// // clear drops (to prevent dropping to ground after placed in chest)
// event.getDrops().clear();
// }
@EventHandler @EventHandler
public void onPlayerDeath(PlayerDeathEvent event) { public void onPlayerDeath(PlayerDeathEvent event) {
final Player player = event.getEntity(); final Player player = event.getEntity();
@ -222,6 +192,27 @@ public class PlayerListeners implements Listener {
event.setCancelled(true); event.setCancelled(true);
} }
@EventHandler
public void onOffhandSwap(final PlayerSwapHandItemsEvent event) {
final Player player = event.getPlayer();
if (AuctionHouse.getInstance().getAuctionPlayerManager().isInSellProcess(player)) {
event.setCancelled(true);
}
}
@EventHandler
public void onItemRemove(final InventoryClickEvent event) {
final HumanEntity clicker = event.getWhoClicked();
if (!(clicker instanceof Player)) return;
final Player player = (Player) clicker;
if (AuctionHouse.getInstance().getAuctionPlayerManager().isInSellProcess(player)) {
event.setCancelled(true);
}
}
@EventHandler @EventHandler
public void onCommandDuringSell(final PlayerCommandPreprocessEvent event) { public void onCommandDuringSell(final PlayerCommandPreprocessEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
@ -248,18 +239,4 @@ public class PlayerListeners implements Listener {
stack = NBTEditor.set(stack, "AUCTION_REPAIRED", "AuctionHouseRepaired"); stack = NBTEditor.set(stack, "AUCTION_REPAIRED", "AuctionHouseRepaired");
event.setResult(stack); event.setResult(stack);
} }
// @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
// public void onInteractDuringSell(final PlayerInteractEvent event) {
// final Player player = event.getPlayer();
// if (AuctionHouse.getInstance().getAuctionPlayerManager().isInSellProcess(player)) {
//
// Bukkit.broadcastMessage("in sell");
// event.setUseItemInHand(Event.Result.DENY);
// event.setUseInteractedBlock(Event.Result.DENY);
// event.setCancelled(true);
// return;
// }
//
// }
} }