JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Players not being given their Gem Hunters rewards for the final time!

Browse Source
This commit is contained in:
Sam 2017-06-08 02:10:24 +01:00
parent 8c821af9de
commit b59e57dfb6
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/loot/LootModule.java
View File

@ -29,6 +29,8 @@ import org.bukkit.block.BlockState;
import org.bukkit.block.Chest;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerPickupItemEvent;
@ -479,10 +481,10 @@ public class LootModule extends MiniPlugin
handleRewardItem((Player) event.getWhoClicked(), itemStack);
}
@EventHandler
@EventHandler(priority = EventPriority.HIGH)
public void pickupItem(PlayerPickupItemEvent event)
{
if (event.getItem() == null)
if (event.getItem() == null || event.isCancelled())
{
return;
}
@ -626,7 +628,7 @@ public class LootModule extends MiniPlugin
{
LootItemReward reward = iterator.next();
if (player.equals(reward.getPlayer()) && player.getInventory().contains(reward.getItemStack()))
if (reward.getPlayer() != null && player.equals(reward.getPlayer()))
{
reward.success();
iterator.remove();
@ -634,6 +636,18 @@ public class LootModule extends MiniPlugin
}
}
@EventHandler
public void playerDeath(PlayerDeathEvent event)
{
for (LootItemReward reward : _itemRewards)
{
if (reward.getPlayer().equals(event.getEntity()))
{
reward.death(event);
}
}
}
public final Set<UUID> getShownPlayers()
{
return _shownPlayers;

3
Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/loot/rewards/LootItemReward.java
View File

@ -38,7 +38,7 @@ public abstract class LootItemReward
public final void collectItem(Player player)
{
if (player.equals(_player))
if (_player != null && player.equals(_player))
{
return;
}
@ -73,6 +73,7 @@ public abstract class LootItemReward
public final void death(PlayerDeathEvent event)
{
_player = null;
}
public boolean isFirstPickup()