mirror of
https://github.com/EngineHub/WorldGuard.git
synced 2024-12-22 00:57:36 +01:00
Fix hunger flags and death messages.
This commit is contained in:
parent
299d2a1f01
commit
5a42980d78
src/main/java/com/sk89q/worldguard
@ -160,8 +160,12 @@ public void onEntityDeath(EntityDeathEvent event) {
|
|||||||
if (wcfg.disableExpDrops) {
|
if (wcfg.disableExpDrops) {
|
||||||
event.setDroppedExp(0);
|
event.setDroppedExp(0);
|
||||||
}
|
}
|
||||||
if (event instanceof PlayerDeathEvent && wcfg.disableDeathMessages) {
|
try {
|
||||||
((PlayerDeathEvent) event).setDeathMessage("");
|
if (event instanceof PlayerDeathEvent && wcfg.disableDeathMessages) {
|
||||||
|
((PlayerDeathEvent) event).setDeathMessage("");
|
||||||
|
}
|
||||||
|
} catch (Throwable t) {
|
||||||
|
// old CraftBukkit, eat it
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -84,11 +84,12 @@ public final class DefaultFlag {
|
|||||||
public static final Flag<?>[] flagsList = new Flag<?>[] {
|
public static final Flag<?>[] flagsList = new Flag<?>[] {
|
||||||
PASSTHROUGH, BUILD, PVP, CHEST_ACCESS, PISTONS,
|
PASSTHROUGH, BUILD, PVP, CHEST_ACCESS, PISTONS,
|
||||||
TNT, LIGHTER, USE, PLACE_VEHICLE, SLEEP,
|
TNT, LIGHTER, USE, PLACE_VEHICLE, SLEEP,
|
||||||
MOB_DAMAGE, MOB_SPAWNING, DENY_SPAWN,
|
MOB_DAMAGE, MOB_SPAWNING, DENY_SPAWN, INVINCIBILITY,
|
||||||
CREEPER_EXPLOSION, GHAST_FIREBALL, ENDER_BUILD,
|
CREEPER_EXPLOSION, GHAST_FIREBALL, ENDER_BUILD,
|
||||||
GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_ENTER, NOTIFY_LEAVE,
|
GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_ENTER, NOTIFY_LEAVE,
|
||||||
EXIT, EXIT_PERM, ENTRY, ENTRY_PERM,
|
EXIT, EXIT_PERM, ENTRY, ENTRY_PERM,
|
||||||
HEAL_AMOUNT, HEAL_DELAY, MIN_HEAL, MAX_HEAL, INVINCIBILITY,
|
HEAL_AMOUNT, HEAL_DELAY, MIN_HEAL, MAX_HEAL,
|
||||||
|
FEED_DELAY, FEED_AMOUNT, MIN_FOOD, MAX_FOOD,
|
||||||
SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT,
|
SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT,
|
||||||
MUSHROOMS, LEAF_DECAY, GRASS_SPREAD,
|
MUSHROOMS, LEAF_DECAY, GRASS_SPREAD,
|
||||||
FIRE_SPREAD, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,
|
FIRE_SPREAD, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,
|
||||||
|
Loading…
Reference in New Issue
Block a user