diff --git a/build.gradle b/build.gradle index 64988a4..db11b33 100644 --- a/build.gradle +++ b/build.gradle @@ -57,7 +57,7 @@ dependencies { //PvP - implementation 'io.github.TogAr2:MinestomPvP:PR62-SNAPSHOT' + implementation 'io.github.TogAr2:MinestomPvP:56a831b41cb2ec6db8da681ad5d212ed7c71e3ee' // Hephaestus engine implementation("team.unnamed:hephaestus-api:0.2.1-SNAPSHOT") @@ -87,5 +87,5 @@ tasks.register('copyJarToServer', Exec) { dependsOn shadowJar mustRunAfter shadowJar - commandLine 'scp', 'build/libs/Minigames-1.0-SNAPSHOT.jar', '/home/lars/Documents/Minecraft/Server/Minestom/Minigames.jar' + commandLine 'scp', 'build/libs/Minigames-1.0-SNAPSHOT.jar', 'root@10.20.6.5:/root/minigames' } diff --git a/src/main/java/eu/mhsl/minenet/minigames/Main.java b/src/main/java/eu/mhsl/minenet/minigames/Main.java index 3503123..7fac3ef 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/Main.java +++ b/src/main/java/eu/mhsl/minenet/minigames/Main.java @@ -6,6 +6,7 @@ import eu.mhsl.minenet.minigames.handler.Listeners; import eu.mhsl.minenet.minigames.instance.Dimension; import eu.mhsl.minenet.minigames.lang.Languages; import eu.mhsl.minenet.minigames.server.tasks.TablistUpdateTask; +import io.github.togar2.pvp.MinestomPvP; import net.minestom.server.Auth; import net.minestom.server.MinecraftServer; import net.minestom.server.extras.lan.OpenToLAN; @@ -53,7 +54,7 @@ public class Main { if(server == null) server = MinecraftServer.init(); -// MinestomPvP.init(); + MinestomPvP.init(); MinecraftServer.setBrandName("mhsl.eu - minenet - credits to minestom"); MinecraftServer.setCompressionThreshold(serverConfig.node("compression-threshold").getInt(0)); diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/highGround/HighGround.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/highGround/HighGround.java index 319a936..958da37 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/highGround/HighGround.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/highGround/HighGround.java @@ -8,6 +8,7 @@ import io.github.togar2.pvp.events.EntityKnockbackEvent; import io.github.togar2.pvp.events.FinalAttackEvent; import io.github.togar2.pvp.events.PrepareAttackEvent; import io.github.togar2.pvp.feature.CombatFeatures; +import io.github.togar2.pvp.feature.knockback.KnockbackSettings; import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.Player; import net.minestom.server.event.instance.InstanceTickEvent; @@ -50,7 +51,7 @@ class HighGround extends StatelessGame { this.eventNode().addListener( EntityKnockbackEvent.class, - entityKnockbackEvent -> entityKnockbackEvent.setStrength(1.1f) + entityKnockbackEvent -> entityKnockbackEvent.setSettings(new KnockbackSettings(1.1, 1.1, 2, 0, 0)) ); this.eventNode().addListener(InstanceTickEvent.class, instanceTickEvent -> {