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

properly get the right position on item use

Browse Source
This commit is contained in:
Flemmli97 2020-08-27 01:34:39 +02:00
parent f576187df1
commit 2f181c49c2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/flemmli97/flan/event/ItemInteractEvents.java
View File

@ -15,6 +15,7 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItem;
import net.minecraft.item.BucketItem; import net.minecraft.item.BucketItem;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemPlacementContext;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUsageContext; import net.minecraft.item.ItemUsageContext;
import net.minecraft.item.Items; import net.minecraft.item.Items;
@ -31,6 +32,7 @@ import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.security.Permission;
import java.util.Set; import java.util.Set;
public class ItemInteractEvents { public class ItemInteractEvents {
@ -74,7 +76,7 @@ public class ItemInteractEvents {
if (context.getWorld().isClient || context.getStack().isEmpty()) if (context.getWorld().isClient || context.getStack().isEmpty())
return ActionResult.PASS; return ActionResult.PASS;
ClaimStorage storage = ClaimStorage.get((ServerWorld) context.getWorld()); ClaimStorage storage = ClaimStorage.get((ServerWorld) context.getWorld());
BlockPos placePos = context.getBlockPos().offset(context.getSide()); BlockPos placePos = new ItemPlacementContext(context).getBlockPos();
Claim claim = storage.getClaimAt(placePos.add(0,255,0)); Claim claim = storage.getClaimAt(placePos.add(0,255,0));
if (claim == null) if (claim == null)
return ActionResult.PASS; return ActionResult.PASS;
@ -206,8 +208,8 @@ public class ItemInteractEvents {
public static void inspect(ServerPlayerEntity player, BlockPos target) { public static void inspect(ServerPlayerEntity player, BlockPos target) {
Claim claim = ClaimStorage.get(player.getServerWorld()).getClaimAt(target); Claim claim = ClaimStorage.get(player.getServerWorld()).getClaimAt(target);
if (claim != null) { if (claim != null) {
String owner = claim.getOwner() == null ? "<Admin>" : "<UNKOWN>"; String owner = claim.isAdminClaim() ? "<Admin>" : "<UNKOWN>";
if (claim.getOwner() != null) { if (!claim.isAdminClaim()) {
GameProfile prof = player.getServer().getUserCache().getByUuid(claim.getOwner()); GameProfile prof = player.getServer().getUserCache().getByUuid(claim.getOwner());
if (prof != null && prof.getName() != null) if (prof != null && prof.getName() != null)
owner = prof.getName(); owner = prof.getName();