Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-10-07 11:07:33 +02:00
Code Issues Projects Releases Wiki Activity

Moved less intensive checks in front when blocking end dragon spawn (#684)

Browse Source 
This comes from #676, but it will not fix issue in given case, as these checks do not take so much time and they often fails in 0.01 miliseconds.
Anyway, adding checks in this order will improve performance for this checks in skyblock end world with enabled flag apx 80% for non-0;0 chunk. (
This commit is contained in:
BONNe 2019-05-17 16:22:10 +03:00 committed by Florian CUNY
parent b2a6396cf8
commit f4af446e2f
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/world/bentobox/bentobox/listeners/BlockEndDragon.java
View File

@ -27,14 +27,19 @@ public class BlockEndDragon implements Listener {
*/ */
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onEnd(ChunkLoadEvent e) { public void onEnd(ChunkLoadEvent e) {
if (!Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(e.getWorld()) if (!e.getWorld().getEnvironment().equals(Environment.THE_END)
|| !e.getWorld().getEnvironment().equals(Environment.THE_END) || e.getChunk().getX() != 0
|| !plugin.getIWM().inWorld(e.getWorld()) || e.getChunk().getZ() != 0
|| !Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(e.getWorld())
|| !plugin.getIWM().inWorld(e.getWorld())
|| !plugin.getIWM().isEndGenerate(e.getWorld()) || !plugin.getIWM().isEndGenerate(e.getWorld())
|| !plugin.getIWM().isEndIslands(e.getWorld()) || !plugin.getIWM().isEndIslands(e.getWorld())
|| !(e.getChunk().getX() == 0 && e.getChunk().getZ() == 0)) { || e.getChunk().getBlock(0, 255, 0).getType().equals(Material.END_PORTAL))
{
// No need to process.
return; return;
} }
// Setting a End Portal at the top will trick dragon legacy check. // Setting a End Portal at the top will trick dragon legacy check.
e.getChunk().getBlock(0, 255, 0).setType(Material.END_PORTAL); e.getChunk().getBlock(0, 255, 0).setType(Material.END_PORTAL);
} }
@ -46,12 +51,12 @@ public class BlockEndDragon implements Listener {
*/ */
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onEndBlockPlace(BlockPlaceEvent e) { public void onEndBlockPlace(BlockPlaceEvent e) {
if (!Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(e.getBlock().getWorld()) if (e.getBlock().getY() != 255
|| e.getBlock().getY() != 255
|| e.getBlock().getX() != 0 || e.getBlock().getX() != 0
|| e.getBlock().getZ() != 0 || e.getBlock().getZ() != 0
|| !e.getBlock().getType().equals(Material.END_PORTAL) || !e.getBlock().getType().equals(Material.END_PORTAL)
|| !e.getBlock().getWorld().getEnvironment().equals(Environment.THE_END) || !e.getBlock().getWorld().getEnvironment().equals(Environment.THE_END)
|| !Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(e.getBlock().getWorld())
|| !plugin.getIWM().inWorld(e.getBlock().getWorld()) || !plugin.getIWM().inWorld(e.getBlock().getWorld())
|| !plugin.getIWM().isEndGenerate(e.getBlock().getWorld()) || !plugin.getIWM().isEndGenerate(e.getBlock().getWorld())
|| !plugin.getIWM().isEndIslands(e.getBlock().getWorld())) { || !plugin.getIWM().isEndIslands(e.getBlock().getWorld())) {
@ -67,12 +72,12 @@ public class BlockEndDragon implements Listener {
*/ */
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onEndBlockBreak(BlockBreakEvent e) { public void onEndBlockBreak(BlockBreakEvent e) {
if (!Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(e.getBlock().getWorld()) if (e.getBlock().getY() != 255
|| e.getBlock().getY() != 255
|| e.getBlock().getX() != 0 || e.getBlock().getX() != 0
|| e.getBlock().getZ() != 0 || e.getBlock().getZ() != 0
|| !e.getBlock().getType().equals(Material.END_PORTAL) || !e.getBlock().getType().equals(Material.END_PORTAL)
|| !e.getBlock().getWorld().getEnvironment().equals(Environment.THE_END) || !e.getBlock().getWorld().getEnvironment().equals(Environment.THE_END)
|| !Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(e.getBlock().getWorld())
|| !plugin.getIWM().inWorld(e.getBlock().getWorld()) || !plugin.getIWM().inWorld(e.getBlock().getWorld())
|| !plugin.getIWM().isEndGenerate(e.getBlock().getWorld()) || !plugin.getIWM().isEndGenerate(e.getBlock().getWorld())
|| !plugin.getIWM().isEndIslands(e.getBlock().getWorld())) { || !plugin.getIWM().isEndIslands(e.getBlock().getWorld())) {