Upstream
/
UltimateStacker
mirror of https://github.com/songoda/UltimateStacker.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix no AI setting when stacking mobs was disabled

This commit is contained in:
ceze88 2023-05-06 12:34:13 +02:00
parent d51a8096ca
commit 0d79bad591
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/songoda/ultimatestacker/listeners/SpawnerListeners.java
View File

@ -40,8 +40,7 @@ public class SpawnerListeners implements Listener {
@EventHandler
public void onSpawn(SpawnerSpawnEvent event) {
if (plugin.getStackingTask() == null) return; //Don't spam error when reloading the plugin
if (!Settings.STACK_ENTITIES.getBoolean()
|| !plugin.spawnersEnabled()
if (!plugin.spawnersEnabled()
|| plugin.getStackingTask().isWorldDisabled(event.getLocation().getWorld())) return;
SpawnerStackManager spawnerStackManager = plugin.getSpawnerStackManager();
@ -65,23 +64,25 @@ public class SpawnerListeners implements Listener {
SpawnerStack spawnerStack = spawnerStackManager.getSpawner(location);
int amountToSpawn = spawnerStack.calculateSpawnCount(entity.getType());
if (amountToSpawn <= 1) return;
int amountToSpawn = Settings.STACK_ENTITIES.getBoolean() ? spawnerStack.calculateSpawnCount(entity.getType()) : 1;
if (amountToSpawn <= 0) return;
entity.remove();
spawnerStack.spawn(amountToSpawn, "EXPLOSION_NORMAL", null, (e) -> {
if (Settings.NO_AI.getBoolean())
if (Settings.NO_AI.getBoolean()) {
EntityUtils.setUnaware(e);
}
if (mcmmo)
if (mcmmo) {
entity.setMetadata("mcMMO: Spawned Entity", new FixedMetadataValue(plugin, true));
}
UltimateStacker.getInstance().getEntityStackManager().setStack(e, amountToSpawn);
return true;
}, event.getEntityType());
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@EventHandler
public void PlayerInteractEventEgg(PlayerInteractEvent event) {
if (!plugin.spawnersEnabled()
|| !event.getAction().equals(Action.RIGHT_CLICK_BLOCK))

4
src/main/java/com/songoda/ultimatestacker/listeners/entity/EntityListeners.java
View File

@ -75,7 +75,7 @@ public class EntityListeners implements Listener {
event.getEntity().setItemStack(item);
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@EventHandler
public void onHurt(EntityDamageByEntityEvent event) {
if (!Settings.STACK_ENTITIES.getBoolean() || !(event.getDamager() instanceof Player)) return;
@ -100,7 +100,7 @@ public class EntityListeners implements Listener {
event.getEntity().setMetadata("US_REASON", new FixedMetadataValue(plugin, event.getSpawnReason().name()));
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@EventHandler
public void onBlow(EntityExplodeEvent event) {
if (!plugin.spawnersEnabled()) return;