mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-06 03:48:05 +02:00
30 lines
1.9 KiB
Diff
30 lines
1.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
|
||
|
Date: Sun, 11 Jun 2023 19:02:46 +0200
|
||
|
Subject: [PATCH] Fix sniffer removeExploredLocation
|
||
|
|
||
|
Add support to remove explored location in different world
|
||
|
|
||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSniffer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSniffer.java
|
||
|
index ca3bffd07e0e8f3b2409917cf561d4755c8fba21..e9e8ee8c87285705366d54c23a59c136c612aaff 100644
|
||
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSniffer.java
|
||
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSniffer.java
|
||
|
@@ -40,12 +40,13 @@ public class CraftSniffer extends CraftAnimals implements Sniffer {
|
||
|
@Override
|
||
|
public void removeExploredLocation(Location location) {
|
||
|
Preconditions.checkArgument(location != null, "location cannot be null");
|
||
|
- if (location.getWorld() != getWorld()) {
|
||
|
- return;
|
||
|
- }
|
||
|
|
||
|
BlockPos blockPosition = CraftLocation.toBlockPosition(location);
|
||
|
- this.getHandle().getBrain().setMemory(MemoryModuleType.SNIFFER_EXPLORED_POSITIONS, this.getHandle().getExploredPositions().filter(blockPositionExplored -> !blockPositionExplored.equals(blockPosition)).collect(Collectors.toList()));
|
||
|
+ // Paper start
|
||
|
+ net.minecraft.world.level.Level level = location.getWorld() != null ? ((org.bukkit.craftbukkit.CraftWorld) location.getWorld()).getHandle() : this.getHandle().level();
|
||
|
+ net.minecraft.core.GlobalPos globalPos = net.minecraft.core.GlobalPos.of(level.dimension(), blockPosition);
|
||
|
+ this.getHandle().getBrain().setMemory(MemoryModuleType.SNIFFER_EXPLORED_POSITIONS, this.getHandle().getExploredPositions().filter(blockPositionExplored -> !blockPositionExplored.equals(globalPos)).collect(Collectors.toList()));
|
||
|
+ // Paper end
|
||
|
}
|
||
|
|
||
|
@Override
|