mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-29 07:59:42 +02:00
9147456fc9
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 CraftBukkit Changes: ab8ace685 SPIGOT-7236: Bone meal doesn't increase use statistic 7dcb59b8e Avoid switch on material in previous commit Spigot Changes: 19641c75 SPIGOT-7235: World.Spigot#strikeLightningEffect doesn't do anything
29 lines
1.6 KiB
Diff
29 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Sat, 25 Apr 2020 17:10:55 -0700
|
|
Subject: [PATCH] Reduce blockpos allocation from pathfinding
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
|
|
index 04406fdb2961a85d8e6bffbb8e233e8c4dcf4390..894881018c659d874f28f5744f0b8247cfecb1c1 100644
|
|
--- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
|
|
+++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
|
|
@@ -483,7 +483,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
|
|
return BlockPathTypes.DANGER_FIRE;
|
|
}
|
|
|
|
- if (world.getFluidState(pos).is(FluidTags.WATER)) {
|
|
+ if (blockState.getFluidState().is(FluidTags.WATER)) {
|
|
return BlockPathTypes.WATER_BORDER;
|
|
}
|
|
} // Paper
|
|
@@ -514,7 +514,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
|
|
} else if (blockState.is(Blocks.COCOA)) {
|
|
return BlockPathTypes.COCOA;
|
|
} else {
|
|
- FluidState fluidState = world.getFluidState(pos);
|
|
+ FluidState fluidState = blockState.getFluidState(); // Paper - remove another get type call
|
|
if (fluidState.is(FluidTags.LAVA)) {
|
|
return BlockPathTypes.LAVA;
|
|
} else if (isBurningBlock(blockState)) {
|