diff options
Diffstat (limited to 'patches/server/0671-Line-Of-Sight-Changes.patch')
| -rw-r--r-- | patches/server/0671-Line-Of-Sight-Changes.patch | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/patches/server/0671-Line-Of-Sight-Changes.patch b/patches/server/0671-Line-Of-Sight-Changes.patch index 28e1141d0b..138bedfb5a 100644 --- a/patches/server/0671-Line-Of-Sight-Changes.patch +++ b/patches/server/0671-Line-Of-Sight-Changes.patch @@ -5,7 +5,11 @@ Subject: [PATCH] Line Of Sight Changes diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java +<<<<<<< HEAD:patches/server/0671-Line-Of-Sight-Changes.patch index fd2d5e274a3bf889b954bed17d286d1157cd208e..709ca3f249a5c4d3a405e94ca353864df349ffcd 100644 +======= +index 471b038564a2507bc1048cad2eb575bec733c009..794a533d61e415f1b7787044a26c94d6331014f4 100644 +>>>>>>> d1059c199 (Add getTargetEntity predicate):patches/server/0677-Line-Of-Sight-Changes.patch --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3449,7 +3449,8 @@ public abstract class LivingEntity extends Entity { @@ -42,7 +46,7 @@ index 06b3377cbe2808187d9f4af1253be9e787ec7f2f..e2f88425ea748384af18b126c6478a58 private static final Random rand = new Random(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 8fe1f5deddfee329c020d93c990dc686fe2b458e..ca176b9331345e343c19a02b6ba2ea886d20962d 100644 +index be1a75bbe3038483ad34b6a0ae14eb9cfd18b6b8..90ec80270f8bc0180f60c2e4f3d1cc50958ee1de 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -29,6 +29,9 @@ import net.minecraft.world.entity.projectile.ThrownEgg; @@ -55,7 +59,7 @@ index 8fe1f5deddfee329c020d93c990dc686fe2b458e..ca176b9331345e343c19a02b6ba2ea88 import org.apache.commons.lang.Validate; import org.bukkit.FluidCollisionMode; import org.bukkit.Location; -@@ -557,6 +560,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -567,6 +570,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { return this.getHandle().hasLineOfSight(((CraftEntity) other).getHandle()); } |