mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-29 06:57:37 +02:00
90fe0d58a5
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 897a0a23 SPIGOT-5753: Back PotionType by a minecraft registry 255b2aa1 SPIGOT-7080: Add World#locateNearestBiome ff984826 Remove javadoc.io doc links CraftBukkit Changes: 71b0135cc SPIGOT-5753: Back PotionType by a minecraft registry a6bcb8489 SPIGOT-7080: Add World#locateNearestBiome ad0e57434 SPIGOT-7502: CraftMetaItem - cannot deserialize BlockStateTag b3efca57a SPIGOT-6400: Use Mockito instead of InvocationHandler 38c599f9d PR-1272: Only allow one entity in CraftItem instead of two f065271ac SPIGOT-7498: ChunkSnapshot.getBlockEmittedLight() gets 64 blocks upper in Overworld Spigot Changes: e0e223fe Remove javadoc.io doc links
65 lines
3.2 KiB
Diff
65 lines
3.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <blake.galbreath@gmail.com>
|
|
Date: Fri, 14 May 2021 13:42:17 -0500
|
|
Subject: [PATCH] Add Mob#lookAt API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
|
index 522b7cb1db22b02279b004916ad2a14447a6bbed..c90f9b519c82327b787d2920b3bb079efb0c7e8a 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
|
@@ -99,5 +99,53 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
|
|
public boolean isInDaylight() {
|
|
return getHandle().isSunBurnTick();
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public void lookAt(@org.jetbrains.annotations.NotNull org.bukkit.Location location) {
|
|
+ com.google.common.base.Preconditions.checkNotNull(location, "location cannot be null");
|
|
+ com.google.common.base.Preconditions.checkArgument(location.getWorld().equals(getWorld()), "location in a different world");
|
|
+ getHandle().getLookControl().setLookAt(location.getX(), location.getY(), location.getZ());
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void lookAt(@org.jetbrains.annotations.NotNull org.bukkit.Location location, float headRotationSpeed, float maxHeadPitch) {
|
|
+ com.google.common.base.Preconditions.checkNotNull(location, "location cannot be null");
|
|
+ com.google.common.base.Preconditions.checkArgument(location.getWorld().equals(getWorld()), "location in a different world");
|
|
+ getHandle().getLookControl().setLookAt(location.getX(), location.getY(), location.getZ(), headRotationSpeed, maxHeadPitch);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void lookAt(@org.jetbrains.annotations.NotNull org.bukkit.entity.Entity entity) {
|
|
+ com.google.common.base.Preconditions.checkNotNull(entity, "entity cannot be null");
|
|
+ com.google.common.base.Preconditions.checkArgument(entity.getWorld().equals(getWorld()), "entity in a different world");
|
|
+ getHandle().getLookControl().setLookAt(((CraftEntity) entity).getHandle());
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void lookAt(@org.jetbrains.annotations.NotNull org.bukkit.entity.Entity entity, float headRotationSpeed, float maxHeadPitch) {
|
|
+ com.google.common.base.Preconditions.checkNotNull(entity, "entity cannot be null");
|
|
+ com.google.common.base.Preconditions.checkArgument(entity.getWorld().equals(getWorld()), "entity in a different world");
|
|
+ getHandle().getLookControl().setLookAt(((CraftEntity) entity).getHandle(), headRotationSpeed, maxHeadPitch);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void lookAt(double x, double y, double z) {
|
|
+ getHandle().getLookControl().setLookAt(x, y, z);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void lookAt(double x, double y, double z, float headRotationSpeed, float maxHeadPitch) {
|
|
+ getHandle().getLookControl().setLookAt(x, y, z, headRotationSpeed, maxHeadPitch);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int getHeadRotationSpeed() {
|
|
+ return getHandle().getHeadRotSpeed();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public int getMaxHeadPitch() {
|
|
+ return getHandle().getMaxHeadXRot();
|
|
+ }
|
|
// Paper end
|
|
}
|