mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 01:12:47 +01:00
0cdce89d59
If a playerdata doesn't contain a valid, loaded world, reset to the main world spawn point
28 lines
1.7 KiB
Diff
28 lines
1.7 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 10503d6d8b6daf645cf4360ee289d5e25144c976..3583fcf5284bc5883308876dbd9886664b391e28 100644
|
|
--- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
|
|
+++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
|
|
@@ -473,7 +473,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;
|
|
}
|
|
|
|
@@ -504,7 +504,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
|
|
} else if (blockState.is(Blocks.COCOA)) {
|
|
return BlockPathTypes.COCOA;
|
|
} else if (!blockState.is(Blocks.WITHER_ROSE) && !blockState.is(Blocks.POINTED_DRIPSTONE)) {
|
|
- FluidState fluidState = world.getFluidState(pos);
|
|
+ FluidState fluidState = blockState.getFluidState(); // Paper - remove another getFluidState call
|
|
if (fluidState.is(FluidTags.LAVA)) {
|
|
return BlockPathTypes.LAVA;
|
|
} else if (isBurningBlock(blockState)) {
|