mirror of
https://github.com/TotalFreedomMC/TF-PlotSquared.git
synced 2024-12-23 00:15:06 +00:00
parent
df6914fb1e
commit
9020d740d1
2 changed files with 1 additions and 4 deletions
|
@ -2515,7 +2515,7 @@ public class PlayerEvents extends PlotListener implements Listener {
|
|||
return false;
|
||||
}
|
||||
// player is null
|
||||
return (dArea != null && dArea.MOB_DAMAGE) || !(damager instanceof Arrow && !(victim instanceof Creature));
|
||||
return !(damager instanceof Arrow && !(victim instanceof Creature));
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
|
|
|
@ -52,7 +52,6 @@ public abstract class PlotArea {
|
|||
public boolean MISC_SPAWN_UNOWNED = false;
|
||||
public boolean MOB_SPAWNING = false;
|
||||
public boolean MOB_SPAWNER_SPAWNING = false;
|
||||
public boolean MOB_DAMAGE = false;
|
||||
public String PLOT_BIOME = "FOREST";
|
||||
public boolean PLOT_CHAT = false;
|
||||
public boolean SCHEMATIC_CLAIM_SPECIFY = false;
|
||||
|
@ -218,7 +217,6 @@ public abstract class PlotArea {
|
|||
this.TERRAIN = config.getInt("generator.terrain");
|
||||
this.TYPE = config.getInt("generator.type");
|
||||
}
|
||||
this.MOB_DAMAGE = config.getBoolean("mob_damage");
|
||||
this.MOB_SPAWNING = config.getBoolean("natural_mob_spawning");
|
||||
this.MISC_SPAWN_UNOWNED = config.getBoolean("misc_spawn_unowned");
|
||||
this.MOB_SPAWNER_SPAWNING = config.getBoolean("mob_spawner_spawning");
|
||||
|
@ -328,7 +326,6 @@ public abstract class PlotArea {
|
|||
*/
|
||||
public void saveConfiguration(ConfigurationSection config) {
|
||||
HashMap<String, Object> options = new HashMap<>();
|
||||
options.put("mob_damage", this.MOB_DAMAGE);
|
||||
options.put("natural_mob_spawning", this.MOB_SPAWNING);
|
||||
options.put("misc_spawn_unowned", this.MISC_SPAWN_UNOWNED);
|
||||
options.put("mob_spawner_spawning", this.MOB_SPAWNER_SPAWNING);
|
||||
|
|
Loading…
Reference in a new issue