Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2024-11-29 22:23:54 +01:00
Code Issues Projects Releases Wiki Activity

Prevent spectators from taking damage at all times.

Browse Source 
Spectating is possible both during and before/after arena sessions. This means that an early return from the entity damage cancellation logic when the arena isn't running is going to allow damage to go through to spectators of non-running arenas, which means they can die. By simply removing the early return (and placing it in the one branch that actually requires it explicitly), spectators should no longer be able to take damage.

This fixes #502.
This commit is contained in:
Andreas Troelsen 2018-12-30 14:05:02 +01:00
parent 399b228999
commit 624b87f4d3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -13,6 +13,7 @@ These changes will (most likely) be included in the next version.
## [Unreleased] ## [Unreleased]
- Like the other user commands, the permission for `/ma ready` now defaults to true. - Like the other user commands, the permission for `/ma ready` now defaults to true.
- Unbreakable weapons and armor now use the unbreakable item flag instead of item durability and on-hit repairs. This means that MobArena's unbreakable items are now compatible with plugins that depend on special durability values, such as QualityArmory. - Unbreakable weapons and armor now use the unbreakable item flag instead of item durability and on-hit repairs. This means that MobArena's unbreakable items are now compatible with plugins that depend on special durability values, such as QualityArmory.
- Spectators can no longer take damage when the arena isn't running.
## [0.103] - 2018-08-28 ## [0.103] - 2018-08-28
- It is now possible to add a fixed delay (in seconds) between waves with the new per-arena setting `next-wave-delay`. - It is now possible to add a fixed delay (in seconds) between waves with the new per-arena setting `next-wave-delay`.

7
src/main/java/com/garbagemule/MobArena/ArenaListener.java
View File

@ -690,9 +690,6 @@ public class ArenaListener
public void onEntityDamage(EntityDamageEvent event) { public void onEntityDamage(EntityDamageEvent event) {
Entity damagee = event.getEntity(); Entity damagee = event.getEntity();
if (!arena.isRunning() && !arena.getRegion().contains(damagee.getLocation())) {
return;
}
EntityDamageByEntityEvent edbe = (event instanceof EntityDamageByEntityEvent) ? (EntityDamageByEntityEvent) event : null; EntityDamageByEntityEvent edbe = (event instanceof EntityDamageByEntityEvent) ? (EntityDamageByEntityEvent) event : null;
Entity damager = null; Entity damager = null;
@ -736,7 +733,9 @@ public class ArenaListener
} }
// Snowmen melting // Snowmen melting
else if (damagee instanceof Snowman && event.getCause() == DamageCause.MELTING) { else if (damagee instanceof Snowman && event.getCause() == DamageCause.MELTING) {
event.setCancelled(true); if (arena.isRunning() && arena.getRegion().contains(damagee.getLocation())) {
event.setCancelled(true);
}
} }
// Boss monster // Boss monster
else if (boss != null) { else if (boss != null) {