fixed issues in AntiPlayerLootDespawn
This commit is contained in:
1 parent
c3b30e4329
commit
73fa6649af
2 files changed
+30
-30
No files matched your search
+16
@@ -1,12 +1,28 @@
|
||||
package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.antiPlayerLootDespawn;
|
||||
|
||||
import eu.mhsl.craftattack.spawn.core.appliance.Appliance;
|
||||
import org.bukkit.NamespacedKey;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.persistence.PersistentDataType;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
public class AntiPlayerLootDespawn extends Appliance {
|
||||
private static final int extraCycles = 5;
|
||||
private static final String namespace = AntiPlayerLootDespawnListener.class.getSimpleName().toLowerCase(Locale.ROOT);
|
||||
public static NamespacedKey cyclesKey = new NamespacedKey(namespace, "item_deaths_cycles".toLowerCase());
|
||||
|
||||
public void getItems(List<ItemStack> item) {
|
||||
item.forEach(itemStack ->
|
||||
itemStack.editPersistentDataContainer(persistentDataContainer ->
|
||||
persistentDataContainer.set(cyclesKey, PersistentDataType.INTEGER, extraCycles)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected @NotNull List<Listener> listeners() {
|
||||
return List.of(new AntiPlayerLootDespawnListener());
|
||||
|
||||
+14
-30
@@ -1,51 +1,35 @@
|
||||
package eu.mhsl.craftattack.spawn.craftattack.appliances.metaGameplay.antiPlayerLootDespawn;
|
||||
|
||||
import eu.mhsl.craftattack.spawn.core.appliance.ApplianceListener;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.NamespacedKey;
|
||||
import org.bukkit.entity.Item;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.entity.ItemDespawnEvent;
|
||||
import org.bukkit.event.entity.ItemSpawnEvent;
|
||||
import org.bukkit.event.entity.PlayerDeathEvent;
|
||||
import org.bukkit.persistence.PersistentDataContainer;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.persistence.PersistentDataType;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
public class AntiPlayerLootDespawnListener extends ApplianceListener<AntiPlayerLootDespawn> {
|
||||
private static final int extraCycles = 5;
|
||||
private static final String namespace = AntiPlayerLootDespawnListener.class.getSimpleName().toLowerCase(Locale.ROOT);
|
||||
public static NamespacedKey cyclesKey = new NamespacedKey(namespace, "item_deaths_cycles".toLowerCase());
|
||||
private Location lastDeathLocation;
|
||||
private long lastDeathTick = -1;
|
||||
class AntiPlayerLootDespawnListener extends ApplianceListener<AntiPlayerLootDespawn> {
|
||||
|
||||
@EventHandler
|
||||
public void onDeath(PlayerDeathEvent event) {
|
||||
this.lastDeathLocation = event.getEntity().getLocation();
|
||||
this.lastDeathTick = event.getPlayer().getWorld().getGameTime();
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onItemSpawn(ItemSpawnEvent event) {
|
||||
Item item = event.getEntity();
|
||||
|
||||
if(this.lastDeathLocation == null) return;
|
||||
if(!item.getWorld().equals(this.lastDeathLocation.getWorld())) return;
|
||||
if (item.getWorld().getGameTime() != this.lastDeathTick) return;
|
||||
if(item.getLocation().distanceSquared(this.lastDeathLocation) > 9) return;
|
||||
|
||||
item.getPersistentDataContainer().set(cyclesKey, PersistentDataType.INTEGER, extraCycles);
|
||||
this.getAppliance().getItems(event.getDrops());
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onItemDespawn(ItemDespawnEvent event) {
|
||||
PersistentDataContainer data = event.getEntity().getPersistentDataContainer();
|
||||
Integer cycles = data.get(cyclesKey, PersistentDataType.INTEGER);
|
||||
Item item = event.getEntity();
|
||||
ItemStack itemStack = item.getItemStack();
|
||||
|
||||
if(cycles == null || cycles <= 0) return;
|
||||
int cycles = itemStack.getPersistentDataContainer()
|
||||
.getOrDefault(AntiPlayerLootDespawn.cyclesKey, PersistentDataType.INTEGER, 0);
|
||||
|
||||
data.set(cyclesKey, PersistentDataType.INTEGER, cycles - 1);
|
||||
if(cycles <= 0) return;
|
||||
|
||||
itemStack.editPersistentDataContainer(data ->
|
||||
data.set(AntiPlayerLootDespawn.cyclesKey, PersistentDataType.INTEGER, cycles - 1)
|
||||
);
|
||||
|
||||
item.setItemStack(itemStack);
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user