diff --git a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java index 5b0807b..358c98a 100644 --- a/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java +++ b/src/main/java/xyz/hynse/foliaflow/FoliaFlow.java @@ -18,7 +18,7 @@ public class FoliaFlow extends JavaPlugin { public static double horizontalCoefficient; public static double verticalCoefficient; public static double spawnHeight; - public static double foliaOffset; + public static double TeleportOffset; @Override public void onEnable() { @@ -51,6 +51,10 @@ public class FoliaFlow extends JavaPlugin { double horizontalCoefficient = isFolia ? 1.499 : 1.3; config.set("horizontal_coefficient", horizontalCoefficient); } + if (!config.contains("teleport_offset")) { + double telportCoefficient = isFolia ? 0.5 : 6; + config.set("teleport_offset", telportCoefficient); + } try { config.save(configFile); } catch (IOException e) { @@ -64,7 +68,7 @@ public class FoliaFlow extends JavaPlugin { horizontalCoefficient = getConfig().getDouble("horizontal_coefficient"); verticalCoefficient = getConfig().getDouble("vertical_coefficient"); spawnHeight = getConfig().getDouble("spawn_height"); - foliaOffset = getConfig().getDouble("folia_offset"); + TeleportOffset = getConfig().getDouble("teleport_offset"); } private void register() { diff --git a/src/main/java/xyz/hynse/foliaflow/watcher/PortalWatcher.java b/src/main/java/xyz/hynse/foliaflow/watcher/PortalWatcher.java index 7626f53..d1117e8 100644 --- a/src/main/java/xyz/hynse/foliaflow/watcher/PortalWatcher.java +++ b/src/main/java/xyz/hynse/foliaflow/watcher/PortalWatcher.java @@ -38,8 +38,8 @@ public class PortalWatcher implements Listener { // Add vector seems vanilla. SchedulerUtil.runLaterEntity(dummy, FoliaFlow.instance, () -> { - // Portal teleportation on Folia is a bit below vanilla, so we teleport it above - if (SchedulerUtil.isFolia()) dummy.teleportAsync(dummy.getLocation().add(0, FoliaFlow.foliaOffset, 0)); + // Portal teleportation is a bit below vanilla, so we teleport it above (happen on paper 1.20 b169) + dummy.teleportAsync(dummy.getLocation().add(0, FoliaFlow.TeleportOffset, 0)); dummy.setVelocity(dummyVel); }, 2 diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 4395b8a..fafd32c 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -6,7 +6,7 @@ # Optimize value for horizontal_coefficient # - Folia (1.499) # - Paper (1.3) -horizontal_coefficient: 1.499 +horizontal_coefficient: 1.3 vertical_coefficient: -1.7 spawn_height: 0.08 -folia_offset: -1 +teleport_offset: 0.5