From c2636d3a00b5a23bf34607a4a50b702bd9647a82 Mon Sep 17 00:00:00 2001 From: samolego <34912839+samolego@users.noreply.github.com> Date: Thu, 26 May 2022 21:02:51 +0200 Subject: [PATCH] Fixes #95 --- .../main/java/org/samo_lego/taterzens/npc/TaterzenNPC.java | 6 +++--- gradle.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/org/samo_lego/taterzens/npc/TaterzenNPC.java b/common/src/main/java/org/samo_lego/taterzens/npc/TaterzenNPC.java index 4c43f202c..e5bab878e 100644 --- a/common/src/main/java/org/samo_lego/taterzens/npc/TaterzenNPC.java +++ b/common/src/main/java/org/samo_lego/taterzens/npc/TaterzenNPC.java @@ -1077,12 +1077,11 @@ public boolean isEquipmentEditor(@NotNull Player player) { /** * Handles interaction (right clicking on the NPC). * @param player player interacting with NPC - * @param pos interaction pos * @param hand player's interacting hand * @return {@link InteractionResult#PASS} if NPC has a right click action, otherwise {@link InteractionResult#FAIL} */ @Override - public InteractionResult interactAt(Player player, Vec3 pos, InteractionHand hand) { + public InteractionResult mobInteract(Player player, InteractionHand hand) { ITaterzenPlayer ipl = (ITaterzenPlayer) player; long lastAction = ((ServerPlayer) player).getLastActionTime(); @@ -1094,7 +1093,7 @@ public InteractionResult interactAt(Player player, Vec3 pos, InteractionHand han for(TaterzenProfession profession : this.professions.values()) { - InteractionResult professionResult = profession.interactAt(player, pos, hand); + InteractionResult professionResult = profession.interactAt(player, player.position(), hand); if(professionResult != InteractionResult.PASS) return professionResult; } @@ -1197,6 +1196,7 @@ else if(player.isShiftKeyDown()) { return this.interact(player, hand); } + /** * Sets the cooldown message. * @param message new cooldown message. diff --git a/gradle.properties b/gradle.properties index b0a5e3b8e..828e8b4ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ fabric_version=0.53.4+1.18.2 forge_version=40.0.19 # Mod Properties -mod_version = 1.9.3 +mod_version = 1.9.4 maven_group = org.samo_lego archives_base_name = taterzens