Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-10-22 20:30:53 +02:00
Code Issues Projects Releases Wiki Activity

Fixed some concurrency concerns around BleedTasks

Browse Source
This commit is contained in:
Shane Freeder 2019-07-29 17:41:57 +01:00
parent 62ce98c8a5
commit e4d980b135
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog.txt
View File

@ -1,3 +1,7 @@
Version 2.1.101
mcnotify command now checks that it's being executed by a player
Fixed some concurrency concerns around BleedTasks
Version 2.1.100
Corrected some mistakes made in the updated Russian locale (thanks myfbone!)

2
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@ -259,8 +259,6 @@ public class EntityListener implements Listener {
if(defender.getMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY).size() > 0)
{
defender.removeMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY, plugin);
if(defender instanceof Player)
{
LivingEntity defLive = (LivingEntity) defender;

6
src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java
View File

@ -9,6 +9,8 @@ import com.gmail.nossr50.util.skills.CombatUtils;
import com.gmail.nossr50.util.skills.ParticleEffectUtils;
import com.gmail.nossr50.util.sounds.SoundManager;
import com.gmail.nossr50.util.sounds.SoundType;
import org.bukkit.Bukkit;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@ -171,6 +173,10 @@ public class BleedTimerTask extends BukkitRunnable {
* @param ticks Number of bleeding ticks
*/
public static void add(LivingEntity entity, LivingEntity attacker, int ticks, int bleedRank, int toolTier) {
if (!Bukkit.isPrimaryThread()) {
throw new IllegalStateException("Cannot add bleed task async!");
}
if(toolTier < 4)
ticks = Math.max(1, (ticks / 3));

1
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -552,6 +552,7 @@ public final class CombatUtils {
target.setMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY, mcMMO.metadataValue);
target.damage(damage, attacker);
target.removeMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY, mcMMO.p);
// //IFrame storage
//// int noDamageTicks = target.getNoDamageTicks();