2023-06-16 15:33:25 +02:00
|
|
|
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
|
2023-08-14 01:32:51 +02:00
|
|
|
index 1c8b67de03aefe91bf80782fb14fb629a458ecc3..01328768ef2baba2aa7fea7e10b0eb9783497f4b 100644
|
2023-06-16 15:33:25 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSniffer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSniffer.java
|
2023-08-14 01:32:51 +02:00
|
|
|
@@ -34,12 +34,13 @@ public class CraftSniffer extends CraftAnimals implements Sniffer {
|
2023-06-16 15:33:25 +02:00
|
|
|
@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
|