From 5b1cb6aaf9005f90e52b3e6a9ff2d91d2c345ffb Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 9 Oct 2019 00:39:16 -0300 Subject: [PATCH] fixed wrong call --- src/main/java/carpet/script/CarpetEventServer.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/carpet/script/CarpetEventServer.java b/src/main/java/carpet/script/CarpetEventServer.java index b1f0016c..754216f7 100644 --- a/src/main/java/carpet/script/CarpetEventServer.java +++ b/src/main/java/carpet/script/CarpetEventServer.java @@ -207,6 +207,7 @@ public class CarpetEventServer }, PLAYER_USES_ITEM("player_uses_item",new CallbackList(3)) { + @Override public void onItemAction(ServerPlayerEntity player, Hand enumhand, ItemStack itemstack) { handler.call( () -> @@ -222,14 +223,15 @@ public class CarpetEventServer }, PLAYER_CLICKS_BLOCK("player_clicks_block",new CallbackList(3)) { - public void onItemAction(ServerPlayerEntity player, Hand enumhand, ItemStack itemstack) + @Override + public void onBlockAction(ServerPlayerEntity player, BlockPos blockpos, Direction facing) { handler.call( () -> { return Arrays.asList( ((c, t) -> new EntityValue(player)), - ((c, t) -> ListValue.fromItemStack(itemstack)), - ((c, t) -> new StringValue(enumhand == Hand.MAIN_HAND ? "mainhand" : "offhand")) + ((c, t) -> new BlockValue(null, player.getServerWorld(), blockpos)), + ((c, t) -> new StringValue(facing.getName())) ); }, player::getCommandSource); } @@ -345,6 +347,7 @@ public class CarpetEventServer }, PLAYER_FINISHED_USING_ITEM("player_finishes_using_item",new CallbackList(3)) { + @Override public void onItemAction(ServerPlayerEntity player, Hand enumhand, ItemStack itemstack) { // this.getStackInHand(this.getActiveHand()), this.activeItemStack) @@ -360,9 +363,6 @@ public class CarpetEventServer }; // on projectile thrown (arrow from bows, crossbows, tridents, snoballs, e-pearls - - - public String name; public static Map byName = new HashMap(){{ for (Event e: Event.values())