From b3cd41fe3a219a5043405d13b4ed66f9b31dc40d Mon Sep 17 00:00:00 2001 From: okx-code Date: Fri, 23 Feb 2024 22:28:21 +0000 Subject: [PATCH 1/2] Make skyBase not additive --- .../simpleadminhacks/hacks/BetterRails.java | 6 ++++-- .../src/main/resources/config.yml | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/BetterRails.java b/plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/BetterRails.java index 7ba157e91..320e303fd 100644 --- a/plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/BetterRails.java +++ b/plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/BetterRails.java @@ -88,10 +88,12 @@ public final class BetterRails extends SimpleHack implements Material belowRail = minecart.getLocation().subtract(0, 1, 0).getBlock().getType(); Material belowRail2 = minecart.getLocation().subtract(0, 2, 0).getBlock().getType(); - double speedMetresPerSecond = maxOrGet(config.getMaxSpeedMetresPerSecond(belowRail), config.getMaxSpeedMetresPerSecond(belowRail2), config.getBaseSpeed()); + double speedMetresPerSecond; if (minecart.getLocation().getBlockY() == minecart.getWorld().getHighestBlockYAt(minecart.getLocation(), HeightMap.WORLD_SURFACE)) { - speedMetresPerSecond += maxOrGet(config.getSkySpeedMetresPerSecond(belowRail), config.getSkySpeedMetresPerSecond(belowRail2), config.getSkySpeed()); + speedMetresPerSecond = maxOrGet(config.getSkySpeedMetresPerSecond(belowRail), config.getSkySpeedMetresPerSecond(belowRail2), config.getSkySpeed()); + } else { + speedMetresPerSecond = maxOrGet(config.getMaxSpeedMetresPerSecond(belowRail), config.getMaxSpeedMetresPerSecond(belowRail2), config.getBaseSpeed()); } diff --git a/plugins/simpleadminhacks-paper/src/main/resources/config.yml b/plugins/simpleadminhacks-paper/src/main/resources/config.yml index 7a2b72411..1c24a3e09 100644 --- a/plugins/simpleadminhacks-paper/src/main/resources/config.yml +++ b/plugins/simpleadminhacks-paper/src/main/resources/config.yml @@ -521,20 +521,20 @@ hacks: enabled: true # All in metres per second # Minecraft will prevent you going faster than 30m/s - base: 12 + base: 11 materials: COBBLESTONE: 8 COPPER_BLOCK: 29 EXPOSED_COPPER: 23 WEATHERED_COPPER: 18 OXIDIZED_COPPER: 14 - skyBase: 1 + skyBase: 12 skyMaterials: - COBBLESTONE: 0 - COPPER_BLOCK: 1 - EXPOSED_COPPER: 1 - WEATHERED_COPPER: 1 - OXIDIZED_COPPER: 1 + COBBLESTONE: 8 + COPPER_BLOCK: 29 + EXPOSED_COPPER: 23 + WEATHERED_COPPER: 18 + OXIDIZED_COPPER: 14 CopperRail: enabled: true deoxidise: true From 71b8fc6c9998d58ed4a18f704b063d40a8e05441 Mon Sep 17 00:00:00 2001 From: okx-code Date: Fri, 23 Feb 2024 22:35:56 +0000 Subject: [PATCH 2/2] fix config --- .../simpleadminhacks-paper/src/main/resources/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/simpleadminhacks-paper/src/main/resources/config.yml b/plugins/simpleadminhacks-paper/src/main/resources/config.yml index 1c24a3e09..8e3c57af1 100644 --- a/plugins/simpleadminhacks-paper/src/main/resources/config.yml +++ b/plugins/simpleadminhacks-paper/src/main/resources/config.yml @@ -531,10 +531,10 @@ hacks: skyBase: 12 skyMaterials: COBBLESTONE: 8 - COPPER_BLOCK: 29 - EXPOSED_COPPER: 23 - WEATHERED_COPPER: 18 - OXIDIZED_COPPER: 14 + COPPER_BLOCK: 30 + EXPOSED_COPPER: 24 + WEATHERED_COPPER: 19 + OXIDIZED_COPPER: 15 CopperRail: enabled: true deoxidise: true