-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This update contains mainly bugfixes and some improvements. ### Improved: * Work of pet cooldowns * Performance when pets follow you ### Fixed: * Many possible NPEs (such as #124) * Error on EntityDamageByEntityEvent (#130) * Pet duplication after teleportaton (#110) * Copy the horse's brand bug (#120)
- Loading branch information
Showing
12 changed files
with
274 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
133 changes: 133 additions & 0 deletions
133
src/main/java/ru/endlesscode/rpginventory/pet/CooldownsTimer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| package ru.endlesscode.rpginventory.pet; | ||
|
|
||
| import org.bukkit.Material; | ||
| import org.bukkit.entity.Player; | ||
| import org.bukkit.inventory.Inventory; | ||
| import org.bukkit.inventory.ItemStack; | ||
| import org.bukkit.inventory.meta.ItemMeta; | ||
| import org.bukkit.scheduler.BukkitRunnable; | ||
| import ru.endlesscode.rpginventory.RPGInventory; | ||
| import ru.endlesscode.rpginventory.inventory.InventoryManager; | ||
| import ru.endlesscode.rpginventory.inventory.slot.Slot; | ||
| import ru.endlesscode.rpginventory.inventory.slot.SlotManager; | ||
| import ru.endlesscode.rpginventory.utils.ItemUtils; | ||
|
|
||
| import java.util.*; | ||
| import java.util.concurrent.atomic.AtomicInteger; | ||
|
|
||
| /** | ||
| * Created by Dereku on 17.04.2018 | ||
| * It is part of the RpgInventory. | ||
| * All rights reserved 2014 - 2018 © «EndlessCode Group» | ||
| */ | ||
| public class CooldownsTimer extends BukkitRunnable { | ||
|
|
||
| public final static int TICK_PERIOD = 5; | ||
| private final static int TICK_RATE = 20 / CooldownsTimer.TICK_PERIOD; | ||
| //temporaryMap for avoid CME. | ||
| private final HashMap<UUID, ValuePair> petItemsByPlayer = new HashMap<>(), temporaryMap = new HashMap<>(); | ||
| private final RPGInventory plugin; | ||
| private final Slot petSlot; | ||
|
|
||
| @SuppressWarnings("WeakerAccess") | ||
| public CooldownsTimer(RPGInventory pluginInstance) { | ||
| this.plugin = pluginInstance; | ||
| this.petSlot = Objects.requireNonNull(SlotManager.instance().getPetSlot(), "Pet slot can't be null!"); | ||
| } | ||
|
|
||
| public void addPetCooldown(Player player, ItemStack itemStack) { | ||
| if (player == null || itemStack == null || itemStack.getType() == Material.AIR) { | ||
| //throw new IllegalArgumentException? | ||
| return; | ||
| } | ||
|
|
||
| if (PetManager.getPetFromItem(itemStack) == null) { | ||
| //throw new IllegalArgumentException? | ||
| return; | ||
| } | ||
|
|
||
| this.temporaryMap.put(player.getUniqueId(), new ValuePair(itemStack, new AtomicInteger(0))); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void run() { | ||
| //Because there is no safe way to iterate map. | ||
| if (!this.temporaryMap.isEmpty()) { | ||
| this.petItemsByPlayer.putAll(this.temporaryMap); | ||
| this.temporaryMap.clear(); | ||
| } | ||
|
|
||
| final Iterator<Map.Entry<UUID, ValuePair>> iterator = this.petItemsByPlayer.entrySet().iterator(); | ||
| while (iterator.hasNext()) { | ||
| final Map.Entry<UUID, ValuePair> next = iterator.next(); | ||
| int ticks = next.getValue().getTimer().incrementAndGet(); | ||
|
|
||
| if (ticks % CooldownsTimer.TICK_RATE != 0) { | ||
| continue; | ||
| } | ||
|
|
||
| final Player player = this.plugin.getServer().getPlayer(next.getKey()); | ||
| if (player == null || !InventoryManager.playerIsLoaded(player)) { | ||
| iterator.remove(); | ||
| continue; | ||
| } | ||
|
|
||
| final Inventory inventory = InventoryManager.get(player).getInventory(); | ||
| if (inventory == null || inventory.getItem(PetManager.getPetSlotId()) == null) { | ||
| iterator.remove(); | ||
| continue; | ||
| } | ||
|
|
||
| //Future bug fix of multiple pets cooldown | ||
| //TODO: Improve that. If we need it, ofc. | ||
| /*if (!inventory.getItem(PetManager.getPetSlotId()).isSimilar(next.getValue().getItemStack())) { | ||
| iterator.remove(); | ||
| continue; | ||
| }*/ | ||
|
|
||
| int cooldown = PetManager.getCooldown(next.getValue().getItemStack()); | ||
| if (1 > cooldown) { | ||
| PetManager.saveDeathTime(next.getValue().getItemStack(), 0); | ||
| PetManager.spawnPet(player, next.getValue().getItemStack()); | ||
| inventory.setItem(PetManager.getPetSlotId(), next.getValue().getItemStack()); | ||
| iterator.remove(); | ||
| } else if (60 >= cooldown) { | ||
| final ItemStack item = next.getValue().getItemStack().clone(); | ||
| final ItemMeta itemMeta = item.getItemMeta(); | ||
| itemMeta.setDisplayName( | ||
| itemMeta.getDisplayName() + RPGInventory.getLanguage().getMessage("pet.cooldown", cooldown) | ||
| ); | ||
| item.setItemMeta(itemMeta); | ||
| PetManager.addGlow(item); | ||
|
|
||
| String itemTag = ItemUtils.getTag(item, ItemUtils.PET_TAG); | ||
| if (itemTag != null) { | ||
| ItemUtils.setTag(item, ItemUtils.PET_TAG, itemTag); | ||
| inventory.setItem(PetManager.getPetSlotId(), item); | ||
| } else { | ||
| inventory.setItem(PetManager.getPetSlotId(), this.petSlot.getCup()); | ||
| iterator.remove(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private class ValuePair { | ||
| private final ItemStack itemStack; | ||
| private final AtomicInteger timer; | ||
|
|
||
| private ValuePair(ItemStack itemStack, AtomicInteger timer) { | ||
| this.itemStack = itemStack; | ||
| this.timer = timer; | ||
| } | ||
|
|
||
| private ItemStack getItemStack() { | ||
| return itemStack; | ||
| } | ||
|
|
||
| private AtomicInteger getTimer() { | ||
| return timer; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.