diff --git a/Spigot-Server-Patches/0591-Reduce-blockpos-allocation-from-pathfinding.patch b/Spigot-Server-Patches/0591-Reduce-blockpos-allocation-from-pathfinding.patch
new file mode 100644
index 0000000000..93cbcfcce3
--- /dev/null
+++ b/Spigot-Server-Patches/0591-Reduce-blockpos-allocation-from-pathfinding.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <spottedleaf@spottedleaf.dev>
+Date: Sat, 25 Apr 2020 17:10:55 -0700
+Subject: [PATCH] Reduce blockpos allocation from pathfinding
+
+
+diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
+index a0555b132d6ddd2c6c259ae569e411606e496d1d..7341b5afd31eb771b3a7dc883d6540f575d37b4b 100644
+--- a/src/main/java/net/minecraft/server/PathfinderNormal.java
++++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
+@@ -475,7 +475,7 @@ public class PathfinderNormal extends PathfinderAbstract {
+                             return PathType.DANGER_FIRE;
+                         }
+ 
+-                        if (iblockaccess.getFluid(blockposition_mutableblockposition).a((Tag) TagsFluid.WATER)) {
++                        if (iblockdata.getFluid().a((Tag) TagsFluid.WATER)) { // Paper - remove another getType call
+                             return PathType.WATER_BORDER;
+                         }
+                         } // Paper
+@@ -505,7 +505,7 @@ public class PathfinderNormal extends PathfinderAbstract {
+             } else if (iblockdata.a(Blocks.COCOA)) {
+                 return PathType.COCOA;
+             } else {
+-                Fluid fluid = iblockaccess.getFluid(blockposition);
++                Fluid fluid = iblockdata.getFluid(); // Paper - remove another get type call
+ 
+                 return fluid.a((Tag) TagsFluid.WATER) ? PathType.WATER : (fluid.a((Tag) TagsFluid.LAVA) ? PathType.LAVA : (a(iblockdata) ? PathType.DAMAGE_FIRE : (BlockDoor.l(iblockdata) && !(Boolean) iblockdata.get(BlockDoor.OPEN) ? PathType.DOOR_WOOD_CLOSED : (block instanceof BlockDoor && material == Material.ORE && !(Boolean) iblockdata.get(BlockDoor.OPEN) ? PathType.DOOR_IRON_CLOSED : (block instanceof BlockDoor && (Boolean) iblockdata.get(BlockDoor.OPEN) ? PathType.DOOR_OPEN : (block instanceof BlockMinecartTrackAbstract ? PathType.RAIL : (block instanceof BlockLeaves ? PathType.LEAVES : (!block.a((Tag) TagsBlock.FENCES) && !block.a((Tag) TagsBlock.WALLS) && (!(block instanceof BlockFenceGate) || (Boolean) iblockdata.get(BlockFenceGate.OPEN)) ? (!iblockdata.a(iblockaccess, blockposition, PathMode.LAND) ? PathType.BLOCKED : PathType.OPEN) : PathType.FENCE))))))));
+             }