From c90c31297971d9e12ae5ed113b57f7c56c23ffaf Mon Sep 17 00:00:00 2001 From: Flemmli97 Date: Sat, 12 Jun 2021 00:43:39 +0200 Subject: [PATCH] fix forge permission --- .../flan/forgeevent/BlockInteractEventsForge.java | 3 ++- .../flan/forgeevent/EntityInteractEventsForge.java | 7 +++++-- gradle.properties | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/forge/src/main/java/io/github/flemmli97/flan/forgeevent/BlockInteractEventsForge.java b/forge/src/main/java/io/github/flemmli97/flan/forgeevent/BlockInteractEventsForge.java index df5236b..a70cc98 100644 --- a/forge/src/main/java/io/github/flemmli97/flan/forgeevent/BlockInteractEventsForge.java +++ b/forge/src/main/java/io/github/flemmli97/flan/forgeevent/BlockInteractEventsForge.java @@ -1,6 +1,7 @@ package io.github.flemmli97.flan.forgeevent; import io.github.flemmli97.flan.event.BlockInteractEvents; +import net.minecraft.server.network.ServerPlayerInteractionManager; import net.minecraft.util.ActionResult; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; @@ -11,7 +12,7 @@ public class BlockInteractEventsForge { public static void breakBlocks(BlockEvent.BreakEvent event) { if (!(event.getWorld() instanceof World)) return; - if (BlockInteractEvents.breakBlocks((World) event.getWorld(), event.getPlayer(), event.getPos(), event.getState(), event.getWorld().getBlockEntity(event.getPos()))) + if (!BlockInteractEvents.breakBlocks((World) event.getWorld(), event.getPlayer(), event.getPos(), event.getState(), event.getWorld().getBlockEntity(event.getPos()))) event.setCanceled(true); } diff --git a/forge/src/main/java/io/github/flemmli97/flan/forgeevent/EntityInteractEventsForge.java b/forge/src/main/java/io/github/flemmli97/flan/forgeevent/EntityInteractEventsForge.java index 1165a64..f2c3e00 100644 --- a/forge/src/main/java/io/github/flemmli97/flan/forgeevent/EntityInteractEventsForge.java +++ b/forge/src/main/java/io/github/flemmli97/flan/forgeevent/EntityInteractEventsForge.java @@ -18,8 +18,11 @@ import net.minecraftforge.eventbus.api.Event; public class EntityInteractEventsForge { - public static ActionResult attackEntity(AttackEntityEvent event) { - return EntityInteractEvents.attackSimple(event.getPlayer(), event.getTarget(), true); + public static void attackEntity(AttackEntityEvent event) { + ActionResult result = EntityInteractEvents.attackSimple(event.getPlayer(), event.getTarget(), true); + if (result == ActionResult.FAIL) { + event.setCanceled(true); + } } public static void useAtEntity(PlayerInteractEvent.EntityInteractSpecific event) { diff --git a/gradle.properties b/gradle.properties index 51b3040..aa445de 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,8 +22,8 @@ curse_page_fabric=https://www.curseforge.com/minecraft/mc-mods/flan curse_versions=1.16.5, Java 8 curse_id_fabric=404578 curse_dep_fabric=fabric-api -curse_page_forge=https://www.curseforge.com/minecraft/mc-mods/flan -curse_id_forge=404578 +curse_page_forge=https://www.curseforge.com/minecraft/mc-mods/flan-forge +curse_id_forge=493246 curse_dep_forge= # Other project_name=Flan