From 08dc0189b0ec338f61672072e1b1618e9eccb1b3 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 14:42:55 +0700 Subject: [PATCH 1/5] fix work everywhere --- .../java/xyz/hynse/foliaflow/FoliaFlow.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index edf3df1..dea517c 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -62,23 +62,23 @@ public class FoliaFlow extends JavaPlugin implements Listener { for (World world : Bukkit.getWorlds()) { for (Entity entity : world.getEntities()) { if (entity.getType() == EntityType.FALLING_BLOCK && entity.getWorld().getEnvironment() == World.Environment.THE_END) { - //Location loc = entity.getLocation(); - //debug("Falling block spawned at location " + loc); - - // Set the initial velocity of the falling block only if it doesn't have a velocity stored - if (!velocitiesMap.containsKey(entity)) { - int index = counter % 4; - counter++; - Vector velocity = velocities[index]; - entity.setVelocity(velocity); - velocitiesMap.put(entity, velocity); // Store the velocity in the map - movingBlocks.add(entity.getLocation()); // Add the location to the set + Location loc = entity.getLocation(); + if (loc.getBlockX() == 100 && loc.getBlockY() == 49 && loc.getBlockZ() == 0) { + // Set the initial velocity of the falling block only if it doesn't have a velocity stored + if (!velocitiesMap.containsKey(entity)) { + int index = counter % 4; + counter++; + Vector velocity = velocities[index]; + entity.setVelocity(velocity); + velocitiesMap.put(entity, velocity); // Store the velocity in the map + movingBlocks.add(entity.getLocation()); // Add the location to the set + } } } } } }), 0L, 1L, TimeUnit.MILLISECONDS); - } catch (NullPointerException e) { + } catch (NullPointerException entity) { getServer().getLogger().info("AsyncScheduler erorr (likly chunky it not load)"); } getServer().getPluginManager().registerEvents(this, this); From 6e7fd76f545e6853857e5127aa9e105e80fd0353 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 14:44:22 +0700 Subject: [PATCH 2/5] version update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4970ade..bc97e26 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { def loader = 'folia' def server = '1.19.4' group = 'xyz.hynse' -version = "1.2-${server}-${loader}" +version = "1.3-${server}-${loader}" repositories { mavenCentral() From 609b0f68df1c132fa1b06e76096fdf3c9b981f87 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 14:45:55 +0700 Subject: [PATCH 3/5] wrong y level --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index dea517c..e5869f7 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -63,7 +63,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { for (Entity entity : world.getEntities()) { if (entity.getType() == EntityType.FALLING_BLOCK && entity.getWorld().getEnvironment() == World.Environment.THE_END) { Location loc = entity.getLocation(); - if (loc.getBlockX() == 100 && loc.getBlockY() == 49 && loc.getBlockZ() == 0) { + if (loc.getBlockX() == 100 && loc.getBlockY() == 48.5 && loc.getBlockZ() == 0) { // Set the initial velocity of the falling block only if it doesn't have a velocity stored if (!velocitiesMap.containsKey(entity)) { int index = counter % 4; From 866151f1af5944db24c6d4a07297b664554cbb45 Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 14:50:09 +0700 Subject: [PATCH 4/5] catch erorr --- .../java/xyz/hynse/foliaflow/FoliaFlow.java | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index e5869f7..939ad4a 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -56,31 +56,33 @@ public class FoliaFlow extends JavaPlugin implements Listener { } catch (NullPointerException block) { getServer().getLogger().info("Region Scheduler erorr (likly chunky it not load)"); } - try { - AsyncScheduler scheduler = getServer().getAsyncScheduler(); - task = scheduler.runAtFixedRate(this, (scheduledTask) -> getScheduler().runTask(this, () -> { - for (World world : Bukkit.getWorlds()) { - for (Entity entity : world.getEntities()) { - if (entity.getType() == EntityType.FALLING_BLOCK && entity.getWorld().getEnvironment() == World.Environment.THE_END) { - Location loc = entity.getLocation(); - if (loc.getBlockX() == 100 && loc.getBlockY() == 48.5 && loc.getBlockZ() == 0) { - // Set the initial velocity of the falling block only if it doesn't have a velocity stored - if (!velocitiesMap.containsKey(entity)) { - int index = counter % 4; - counter++; - Vector velocity = velocities[index]; - entity.setVelocity(velocity); - velocitiesMap.put(entity, velocity); // Store the velocity in the map - movingBlocks.add(entity.getLocation()); // Add the location to the set + AsyncScheduler scheduler = getServer().getAsyncScheduler(); + task = scheduler.runAtFixedRate(this, (scheduledTask) -> getScheduler().runTask(this, () -> { + for (World world : Bukkit.getWorlds()) { + for (Entity entity : world.getEntities()) { + if (entity.getType() == EntityType.FALLING_BLOCK && entity.getWorld().getEnvironment() == World.Environment.THE_END) { + Location loc = entity.getLocation(); + if (loc.getBlockX() == 100 && loc.getBlockY() == 48.5 && loc.getBlockZ() == 0) { + // Set the initial velocity of the falling block only if it doesn't have a velocity stored + if (!velocitiesMap.containsKey(entity)) { + try { + int index = counter % 4; + counter++; + Vector velocity = velocities[index]; + entity.setVelocity(velocity); + velocitiesMap.put(entity, velocity); // Store the velocity in the map + movingBlocks.add(entity.getLocation()); // Add the location to the set + } catch (NullPointerException e) { + // Handle the exception here, for example: + e.printStackTrace(); + getServer().getLogger().info("An error occurred: " + e.getMessage()); + } + } } } } } - } - }), 0L, 1L, TimeUnit.MILLISECONDS); - } catch (NullPointerException entity) { - getServer().getLogger().info("AsyncScheduler erorr (likly chunky it not load)"); - } + }), 0L, 1L, TimeUnit.MILLISECONDS); getServer().getPluginManager().registerEvents(this, this); getServer().getConsoleSender().sendMessage(""); getServer().getConsoleSender().sendMessage(ChatColor.GREEN + " ______________ "); From 2f6cf3536b5424e9ae3d125ad76c290dfb6d3aae Mon Sep 17 00:00:00 2001 From: MidnightTale Date: Thu, 13 Apr 2023 14:54:53 +0700 Subject: [PATCH 5/5] distance in y 48.5 --- src/main/java/xyz/hynse/foliaflow/FoliaFlow.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 939ad4a..57f23ce 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -39,6 +39,7 @@ public class FoliaFlow extends JavaPlugin implements Listener { @Override public void onEnable() { super.onEnable(); + // Get the region scheduler for the server try { RegionScheduler schedulerblock = getServer().getRegionScheduler(); @@ -61,8 +62,9 @@ public class FoliaFlow extends JavaPlugin implements Listener { for (World world : Bukkit.getWorlds()) { for (Entity entity : world.getEntities()) { if (entity.getType() == EntityType.FALLING_BLOCK && entity.getWorld().getEnvironment() == World.Environment.THE_END) { + Location centerLoc = new Location(entity.getWorld(), 100, 48.5, 0); Location loc = entity.getLocation(); - if (loc.getBlockX() == 100 && loc.getBlockY() == 48.5 && loc.getBlockZ() == 0) { + if (loc.distance(centerLoc) <= 1) { // Set the initial velocity of the falling block only if it doesn't have a velocity stored if (!velocitiesMap.containsKey(entity)) { try {