EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Move bleeding to mcBleedTimer

Browse Source 
Put all the logic handling adding/removing/contains there and encapsulate our List
Additionally, should prevent a ConcurrentModificationException by locking, but I'm not 100% on the contiains not throing such an exception.
This commit is contained in:
NuclearW
2012-03-18 16:59:35 -04:00
parent b10f599a87
commit 8f2c424657
9 changed files with 182 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
src/main/java/com/gmail/nossr50/runnables/mcBleedTimer.java Normal file
View File

@ -0,0 +1,164 @@
package com.gmail.nossr50.runnables;
import java.util.HashSet;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import com.gmail.nossr50.Combat;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.locale.mcLocale;
public class mcBleedTimer implements Runnable {
private final mcMMO plugin;
private static HashSet<LivingEntity> bleedList = new HashSet<LivingEntity>();
private static HashSet<LivingEntity> bleedAddList = new HashSet<LivingEntity>();
private static HashSet<LivingEntity> bleedRemoveList = new HashSet<LivingEntity>();
private static boolean lock = false;
public mcBleedTimer(final mcMMO plugin) {
this.plugin = plugin;
}
@Override
public void run() {
// Update bleedList with bleedRemoveList and bleedAddList
updateBleedList();
// Player bleed simulation
for (Player player : plugin.getServer().getOnlinePlayers())
{
if (player == null) continue;
PlayerProfile PP = Users.getProfile(player);
if (PP == null) continue;
if (PP.getBleedTicks() >= 1)
{
//Never kill with Bleeding
if (player.getHealth() - 2 < 0)
{
if (player.getHealth() - 1 > 0)
{
Combat.dealDamage(player, 1);
}
}
else
{
Combat.dealDamage(player, 2);
}
PP.decreaseBleedTicks();
if (PP.getBleedTicks() == 0)
{
player.sendMessage(mcLocale.getString("Swords.StoppedBleeding"));
}
}
}
// Non-player bleed simulation
bleedSimulate();
}
private void bleedSimulate() {
// Lock list for looping
lock = true;
// Bleed monsters/animals
for (LivingEntity entity : bleedList)
{
if ((entity == null || entity.isDead()))
{
remove(entity);
continue;
}
else
{
Combat.dealDamage(entity, 2);
}
}
// Unlock list now that we are done
lock = false;
}
private void updateBleedList() {
if (lock)
{
// We can't do anything when locked.
plugin.getLogger().warning("mcBleedTimer attempted to update the bleedList but the list was locked!");
}
else
{
// Remove
bleedList.removeAll(bleedRemoveList);
bleedRemoveList.clear();
// Add
bleedList.addAll(bleedAddList);
bleedAddList.clear();
}
}
/**
* Remove a LivingEntity from the bleedList if it is in it
*
* @param entity LivingEntity to remove
*/
public static void remove(LivingEntity entity) {
if (lock)
{
// Cannot remove when locked, put into bleedRemoveList
if (!bleedRemoveList.contains(entity))
{
bleedRemoveList.add(entity);
}
}
else
{
// Remove as normal
if (bleedList.contains(entity))
{
bleedList.remove(entity);
}
}
}
/**
* Add a LivingEntity to the bleedList if it is not in it
*
* @param entity LivingEntity to add
*/
public static void add(LivingEntity entity) {
if (lock)
{
// Cannot add when locked, put into bleedAddList
if (!bleedAddList.contains(entity))
{
bleedAddList.add(entity);
}
}
else
{
// Add as normal
if (!bleedList.contains(entity))
{
bleedList.add(entity);
}
}
}
/**
* Check to see if a LivingEntity is in the bleedList
*
* @param entity LivingEntity to check if in the bleedList
* @return true if in the list, false if not
*/
public static boolean contains(LivingEntity entity) {
return (bleedList.contains(entity) || bleedAddList.contains(entity));
}
}

35
src/main/java/com/gmail/nossr50/runnables/mcTimer.java
View File

@ -2,20 +2,16 @@ package com.gmail.nossr50.runnables;
import org.bukkit.entity.*;
import com.gmail.nossr50.Combat;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.m;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.AbilityType;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.mcLocale;
import com.gmail.nossr50.skills.Skills;
public class mcTimer implements Runnable
{
private final mcMMO plugin;
int thecount = 1;
public mcTimer(final mcMMO plugin)
{
@ -56,37 +52,6 @@ public class mcTimer implements Runnable
Skills.watchCooldown(player, PP, curTime, AbilityType.BERSERK);
Skills.watchCooldown(player, PP, curTime, AbilityType.TREE_FELLER);
Skills.watchCooldown(player, PP, curTime, AbilityType.BLAST_MINING);
/*
* PLAYER BLEED MONITORING
*/
if(thecount % 2 == 0 && PP.getBleedTicks() >= 1)
{
//Never kill with Bleeding
if(player.getHealth() - 2 < 0)
{
if(player.getHealth() - 1 > 0)
Combat.dealDamage(player, 1);
} else
Combat.dealDamage(player, 2);
PP.decreaseBleedTicks();
if(PP.getBleedTicks() == 0)
player.sendMessage(mcLocale.getString("Swords.StoppedBleeding"));
}
/*
* NON-PLAYER BLEED MONITORING
*/
if(thecount % 2 == 0)
m.bleedSimulate(plugin);
//SETUP FOR HP REGEN/BLEED
thecount++;
if(thecount >= 81)
thecount = 1;
}
}
}