change tameable to ownable
This commit is contained in:
parent
95cf9cce98
commit
3047269bfc
@ -28,7 +28,7 @@ import net.minecraft.world.InteractionResult;
|
|||||||
import net.minecraft.world.damagesource.DamageSource;
|
import net.minecraft.world.damagesource.DamageSource;
|
||||||
import net.minecraft.world.entity.Entity;
|
import net.minecraft.world.entity.Entity;
|
||||||
import net.minecraft.world.entity.LivingEntity;
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
import net.minecraft.world.entity.TamableAnimal;
|
import net.minecraft.world.entity.OwnableEntity;
|
||||||
import net.minecraft.world.entity.animal.SnowGolem;
|
import net.minecraft.world.entity.animal.SnowGolem;
|
||||||
import net.minecraft.world.entity.boss.wither.WitherBoss;
|
import net.minecraft.world.entity.boss.wither.WitherBoss;
|
||||||
import net.minecraft.world.entity.decoration.ArmorStand;
|
import net.minecraft.world.entity.decoration.ArmorStand;
|
||||||
@ -95,8 +95,8 @@ public class EntityInteractEvents {
|
|||||||
return claim.canInteract(player, PermissionRegistry.TRADING, pos, true) ? InteractionResult.PASS : InteractionResult.FAIL;
|
return claim.canInteract(player, PermissionRegistry.TRADING, pos, true) ? InteractionResult.PASS : InteractionResult.FAIL;
|
||||||
if (entity instanceof ItemFrame)
|
if (entity instanceof ItemFrame)
|
||||||
return claim.canInteract(player, PermissionRegistry.ITEMFRAMEROTATE, pos, true) ? InteractionResult.PASS : InteractionResult.FAIL;
|
return claim.canInteract(player, PermissionRegistry.ITEMFRAMEROTATE, pos, true) ? InteractionResult.PASS : InteractionResult.FAIL;
|
||||||
if (entity instanceof TamableAnimal tame) {
|
if (entity instanceof OwnableEntity tame) {
|
||||||
if (tame.isOwnedBy(player))
|
if (tame.getOwnerUUID() != null && tame.getOwnerUUID().equals(player.getUUID()))
|
||||||
return InteractionResult.PASS;
|
return InteractionResult.PASS;
|
||||||
}
|
}
|
||||||
return claim.canInteract(player, PermissionRegistry.ANIMALINTERACT, pos, true) ? InteractionResult.PASS : InteractionResult.FAIL;
|
return claim.canInteract(player, PermissionRegistry.ANIMALINTERACT, pos, true) ? InteractionResult.PASS : InteractionResult.FAIL;
|
||||||
|
Loading…
Reference in New Issue
Block a user