flewkey/flan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix forge permission

Browse Source
This commit is contained in:
Flemmli97 2021-06-12 00:43:39 +02:00
parent 7371860654
commit c90c312979
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
forge/src/main/java/io/github/flemmli97/flan/forgeevent/BlockInteractEventsForge.java
View File

@ -1,6 +1,7 @@
package io.github.flemmli97.flan.forgeevent; package io.github.flemmli97.flan.forgeevent;
import io.github.flemmli97.flan.event.BlockInteractEvents; import io.github.flemmli97.flan.event.BlockInteractEvents;
import net.minecraft.server.network.ServerPlayerInteractionManager;
import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResult;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent;
@ -11,7 +12,7 @@ public class BlockInteractEventsForge {
public static void breakBlocks(BlockEvent.BreakEvent event) { public static void breakBlocks(BlockEvent.BreakEvent event) {
if (!(event.getWorld() instanceof World)) if (!(event.getWorld() instanceof World))
return; 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); event.setCanceled(true);
} }

7
forge/src/main/java/io/github/flemmli97/flan/forgeevent/EntityInteractEventsForge.java
View File

@ -18,8 +18,11 @@ import net.minecraftforge.eventbus.api.Event;
public class EntityInteractEventsForge { public class EntityInteractEventsForge {
public static ActionResult attackEntity(AttackEntityEvent event) { public static void attackEntity(AttackEntityEvent event) {
return EntityInteractEvents.attackSimple(event.getPlayer(), event.getTarget(), true); ActionResult result = EntityInteractEvents.attackSimple(event.getPlayer(), event.getTarget(), true);
if (result == ActionResult.FAIL) {
event.setCanceled(true);
}
} }
public static void useAtEntity(PlayerInteractEvent.EntityInteractSpecific event) { public static void useAtEntity(PlayerInteractEvent.EntityInteractSpecific event) {

4
gradle.properties
View File

@ -22,8 +22,8 @@ curse_page_fabric=https://www.curseforge.com/minecraft/mc-mods/flan
curse_versions=1.16.5, Java 8 curse_versions=1.16.5, Java 8
curse_id_fabric=404578 curse_id_fabric=404578
curse_dep_fabric=fabric-api curse_dep_fabric=fabric-api
curse_page_forge=https://www.curseforge.com/minecraft/mc-mods/flan curse_page_forge=https://www.curseforge.com/minecraft/mc-mods/flan-forge
curse_id_forge=404578 curse_id_forge=493246
curse_dep_forge= curse_dep_forge=
# Other # Other
project_name=Flan project_name=Flan