From 5e7279b0a23d3cd762385adda81acd699b6a5041 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 25 Mar 2019 13:41:08 -0500 Subject: [PATCH] Fix PlayerInteractEvent using Dist when it should be using LogicalSide (#5611) --- .../event/entity/player/PlayerInteractEvent.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java index 53db04729..28dc20479 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java @@ -31,7 +31,6 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.Cancelable; -import net.minecraftforge.api.distmarker.Dist; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -40,6 +39,7 @@ import static net.minecraftforge.eventbus.api.Event.Result.DEFAULT; import static net.minecraftforge.eventbus.api.Event.Result.DENY; import net.minecraftforge.eventbus.api.Event.Result; +import net.minecraftforge.fml.LogicalSide; /** * PlayerInteractEvent is fired when a player interacts in some way. @@ -371,11 +371,11 @@ public class PlayerInteractEvent extends PlayerEvent } /** - * @return The effective, i.e. logical, side of this interaction. This will be {@link Dist#CLIENT} on the client thread, and {@link Dist#DEDICATED_SERVER} on the server thread. + * @return The effective, i.e. logical, side of this interaction. This will be {@link LogicalSide#CLIENT} on the client thread, and {@link LogicalSide#SERVER} on the server thread. */ - public Dist getSide() + public LogicalSide getSide() { - return getWorld().isRemote ? Dist.CLIENT : Dist.DEDICATED_SERVER; + return getWorld().isRemote ? LogicalSide.CLIENT : LogicalSide.SERVER; } /**