keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fix PlayerInteractEvent using Dist when it should be using LogicalSide (#5611)

This commit is contained in:
Vincent Lee 2019-03-25 13:41:08 -05:00 committed by LexManos
parent 10a06157aa
commit 5e7279b0a2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java
View File

@ -31,7 +31,6 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Cancelable;
import net.minecraftforge.api.distmarker.Dist;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; 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 static net.minecraftforge.eventbus.api.Event.Result.DENY;
import net.minecraftforge.eventbus.api.Event.Result; import net.minecraftforge.eventbus.api.Event.Result;
import net.minecraftforge.fml.LogicalSide;
/** /**
* PlayerInteractEvent is fired when a player interacts in some way. * 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;
} }
/** /**