mirror of
https://github.com/hyperdefined/ToolStats.git
synced 2026-01-27 16:06:04 +00:00
handle edge case
player drops new item from a looted chest onto ground, add origin to it
This commit is contained in:
@@ -73,6 +73,7 @@ public final class ToolStats extends JavaPlugin {
|
|||||||
public ProjectileShoot projectileShoot;
|
public ProjectileShoot projectileShoot;
|
||||||
public ToolStatsKeys toolStatsKeys;
|
public ToolStatsKeys toolStatsKeys;
|
||||||
public InventoryClose inventoryClose;
|
public InventoryClose inventoryClose;
|
||||||
|
public PlayerDrop playerDrop;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
@@ -126,6 +127,7 @@ public final class ToolStats extends JavaPlugin {
|
|||||||
blockDispenseEvent = new BlockDispenseEvent(this);
|
blockDispenseEvent = new BlockDispenseEvent(this);
|
||||||
projectileShoot = new ProjectileShoot(this);
|
projectileShoot = new ProjectileShoot(this);
|
||||||
inventoryClose = new InventoryClose(this);
|
inventoryClose = new InventoryClose(this);
|
||||||
|
playerDrop = new PlayerDrop(this);
|
||||||
|
|
||||||
Bukkit.getServer().getPluginManager().registerEvents(blockBreak, this);
|
Bukkit.getServer().getPluginManager().registerEvents(blockBreak, this);
|
||||||
Bukkit.getServer().getPluginManager().registerEvents(chunkPopulate, this);
|
Bukkit.getServer().getPluginManager().registerEvents(chunkPopulate, this);
|
||||||
@@ -148,6 +150,7 @@ public final class ToolStats extends JavaPlugin {
|
|||||||
Bukkit.getServer().getPluginManager().registerEvents(blockDispenseEvent, this);
|
Bukkit.getServer().getPluginManager().registerEvents(blockDispenseEvent, this);
|
||||||
Bukkit.getServer().getPluginManager().registerEvents(projectileShoot, this);
|
Bukkit.getServer().getPluginManager().registerEvents(projectileShoot, this);
|
||||||
Bukkit.getServer().getPluginManager().registerEvents(inventoryClose, this);
|
Bukkit.getServer().getPluginManager().registerEvents(inventoryClose, this);
|
||||||
|
Bukkit.getServer().getPluginManager().registerEvents(playerDrop, this);
|
||||||
|
|
||||||
this.getCommand("toolstats").setExecutor(commandToolStats);
|
this.getCommand("toolstats").setExecutor(commandToolStats);
|
||||||
|
|
||||||
|
|||||||
65
src/main/java/lol/hyper/toolstats/events/PlayerDrop.java
Normal file
65
src/main/java/lol/hyper/toolstats/events/PlayerDrop.java
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of ToolStats.
|
||||||
|
*
|
||||||
|
* ToolStats is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* ToolStats is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with ToolStats. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package lol.hyper.toolstats.events;
|
||||||
|
|
||||||
|
import lol.hyper.toolstats.ToolStats;
|
||||||
|
import org.bukkit.entity.Item;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.EventHandler;
|
||||||
|
import org.bukkit.event.Listener;
|
||||||
|
import org.bukkit.event.player.PlayerDropItemEvent;
|
||||||
|
import org.bukkit.inventory.Inventory;
|
||||||
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
|
public class PlayerDrop implements Listener {
|
||||||
|
|
||||||
|
private final ToolStats toolStats;
|
||||||
|
|
||||||
|
public PlayerDrop(ToolStats toolStats) {
|
||||||
|
this.toolStats = toolStats;
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void onDrop(PlayerDropItemEvent event) {
|
||||||
|
Player player = event.getPlayer();
|
||||||
|
if (!toolStats.configTools.checkWorld(player.getWorld().getName())) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (toolStats.generateLoot.generatedInventory.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
player.getScheduler().runDelayed(toolStats, scheduledTask -> {
|
||||||
|
Inventory opened = player.getOpenInventory().getTopInventory();
|
||||||
|
if (toolStats.generateLoot.generatedInventory.containsKey(opened)) {
|
||||||
|
Item droppedItemEntity = event.getItemDrop();
|
||||||
|
ItemStack droppedItem = droppedItemEntity.getItemStack();
|
||||||
|
|
||||||
|
if (!toolStats.itemChecker.isValidItem(droppedItem.getType())) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ItemStack newItem = toolStats.inventoryClose.addLootedOrigin(droppedItem, player);
|
||||||
|
if (newItem != null) {
|
||||||
|
droppedItemEntity.setItemStack(newItem);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, null, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user