Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-16 11:30:06 +01:00
Code Issues Projekte Releases Wiki Aktivität
4565495711
Paper/Spigot-Server-Patches/0291-Add-ray-tracing-methods-to-LivingEntity.patch

71 Zeilen
4.2 KiB
Diff
Originalformat Normale Ansicht Verlauf

Compile fixes (#2732)
2019-12-12 19:45:00 +01:00
From 1bd8a641dc923c81dc47c642be0387b5c42f3168 Mon Sep 17 00:00:00 2001
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 3 Sep 2018 18:20:03 -0500
Subject: [PATCH] Add ray tracing methods to LivingEntity
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
Compile fixes (#2732)
2019-12-12 19:45:00 +01:00
index 91b6d6878..1592a705f 100644
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
Little more progress Keep getting interrupted so not as much as I'd like :(
2019-12-12 01:03:31 +01:00
@@ -3252,6 +3252,23 @@ public abstract class EntityLiving extends Entity {
More patches for 1.14
2019-05-05 10:33:44 +02:00
this.c(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND);
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
}
// Paper start
+ public MovingObjectPosition getRayTrace(int maxDistance) {
Fix some compile errors
2019-05-06 01:24:37 +02:00
+ return getRayTrace(maxDistance, RayTrace.FluidCollisionOption.NONE);
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
+ }
+
Fix some compile errors
2019-05-06 01:24:37 +02:00
+ public MovingObjectPosition getRayTrace(int maxDistance, RayTrace.FluidCollisionOption fluidCollisionOption) {
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
+ if (maxDistance < 1 || maxDistance > 120) {
+ throw new IllegalArgumentException("maxDistance must be between 1-120");
+ }
+
Compile fixes (#2732)
2019-12-12 19:45:00 +01:00
+ Vec3D start = new Vec3D(locX(), locY() + getHeadHeight(), locZ());
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
+ org.bukkit.util.Vector dir = getBukkitEntity().getLocation().getDirection().multiply(maxDistance);
+ Vec3D end = new Vec3D(start.x + dir.getX(), start.y + dir.getY(), start.z + dir.getZ());
Remove TODO on Add ray tracing methods to LivingEntity Note: The entity parameter stays 'this' since we want the block the entity is targetting. This can change based on the block the player has in their hand (see scaffholding). With a scaffhold in hand, the scaffhold blocks in the world become solid 1x1x1 cubes, and without they follow their model's shape.
2019-05-13 02:23:21 +02:00
+ RayTrace raytrace = new RayTrace(start, end, RayTrace.BlockCollisionOption.OUTLINE, fluidCollisionOption, this);
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
+
Fix some compile errors
2019-05-06 01:24:37 +02:00
+ return world.rayTrace(raytrace);
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
+ }
+
public int shieldBlockingDelay = world.paperConfig.shieldBlockingDelay;
public int getShieldBlockingDelay() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#2576) * Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears 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: 6527cb58 SPIGOT-5329: Clarify isGlowing documentation 5ddb414f Make Lantern extend BlockData cb888903 Fix typos in previous commits 2a5e0ca2 Bring EnchantItemEvent documentation in line with EnchantmentOffer 3c5fcea2 SPIGOT-5317: Create accessors for player absorption hearts c6e0d625 SPIGOT-5320: Clarify scope of ExactChoice CraftBukkit Changes: a3fdef8c SPIGOT-5331: Add support for Java 13 6ddeb980 SPIGOT-5317: Create accessors for player absorption hearts 5d335e96 SPIGOT-5315: Cannot serialize armor stand ItemMeta Spigot Changes: 94af569b SPIGOT-5319: Async catcher for getNearbyEntities
2019-09-22 06:12:45 +02:00
index 379239567..6f4c6c589 100644
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#2576) * Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears 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: 6527cb58 SPIGOT-5329: Clarify isGlowing documentation 5ddb414f Make Lantern extend BlockData cb888903 Fix typos in previous commits 2a5e0ca2 Bring EnchantItemEvent documentation in line with EnchantmentOffer 3c5fcea2 SPIGOT-5317: Create accessors for player absorption hearts c6e0d625 SPIGOT-5320: Clarify scope of ExactChoice CraftBukkit Changes: a3fdef8c SPIGOT-5331: Add support for Java 13 6ddeb980 SPIGOT-5317: Create accessors for player absorption hearts 5d335e96 SPIGOT-5315: Cannot serialize armor stand ItemMeta Spigot Changes: 94af569b SPIGOT-5319: Async catcher for getNearbyEntities
2019-09-22 06:12:45 +02:00
@@ -195,6 +195,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
return blocks.get(0);
}
+ // Paper start
Update Upstream
2019-05-06 04:58:04 +02:00
+ @Override
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
+ public Block getTargetBlock(int maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode) {
+ net.minecraft.server.MovingObjectPosition rayTrace = getHandle().getRayTrace(maxDistance, net.minecraft.server.MCUtil.getNMSFluidCollisionOption(fluidMode));
More compile error fixes
2019-05-06 02:57:14 +02:00
+ return !(rayTrace instanceof net.minecraft.server.MovingObjectPositionBlock) ? null : org.bukkit.craftbukkit.block.CraftBlock.at(getHandle().world, ((net.minecraft.server.MovingObjectPositionBlock)rayTrace).getBlockPosition());
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
+ }
+
Update Upstream
2019-05-06 04:58:04 +02:00
+ @Override
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
+ public org.bukkit.block.BlockFace getTargetBlockFace(int maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode) {
+ net.minecraft.server.MovingObjectPosition rayTrace = getHandle().getRayTrace(maxDistance, net.minecraft.server.MCUtil.getNMSFluidCollisionOption(fluidMode));
More compile error fixes
2019-05-06 02:57:14 +02:00
+ return !(rayTrace instanceof net.minecraft.server.MovingObjectPositionBlock) ? null : net.minecraft.server.MCUtil.toBukkitBlockFace(((net.minecraft.server.MovingObjectPositionBlock)rayTrace).getDirection());
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
+ }
+
Update Upstream
2019-05-06 04:58:04 +02:00
+ @Override
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
+ public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode) {
+ net.minecraft.server.MovingObjectPosition rayTrace = getHandle().getRayTrace(maxDistance, net.minecraft.server.MCUtil.getNMSFluidCollisionOption(fluidMode));
More compile error fixes
2019-05-06 02:57:14 +02:00
+ return !(rayTrace instanceof net.minecraft.server.MovingObjectPositionBlock) ? null :
+ new com.destroystokyo.paper.block.TargetBlockInfo(org.bukkit.craftbukkit.block.CraftBlock.at(getHandle().world, ((net.minecraft.server.MovingObjectPositionBlock)rayTrace).getBlockPosition()),
+ net.minecraft.server.MCUtil.toBukkitBlockFace(((net.minecraft.server.MovingObjectPositionBlock)rayTrace).getDirection()));
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
+ }
+ // Paper end
+
Update Upstream
2019-05-06 04:58:04 +02:00
@Override
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
public List<Block> getLastTwoTargetBlocks(Set<Material> transparent, int maxDistance) {
return getLineOfSight(transparent, maxDistance, 2);
--
Compile fixes (#2732)
2019-12-12 19:45:00 +01:00
2.24.1
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-04 01:59:54 +02:00
In neuem Issue referenzieren Permalink kopieren