SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

fix patch 'Remove streams from SensorNearest' (fixes #5330)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Trigary 2021-03-10 12:24:20 +01:00
Ursprung e59776a02e
Commit 32f7b1fa11
1 geänderte Dateien mit 7 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

12
Spigot-Server-Patches/Remove-streams-from-SensorNearest.patch
Datei anzeigen

@ -85,7 +85,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- }); - });
+ // Paper start - remove streams in favour of lists + // Paper start - remove streams in favour of lists
+ List<EntityHuman> players = new java.util.ArrayList<>(worldserver.getPlayers()); + List<EntityHuman> players = new java.util.ArrayList<>(worldserver.getPlayers());
+ players.removeIf(player -> IEntitySelector.notSpectator().test(player) || entityliving.a(player, 16.0D)); // Paper - removeIf only re-allocates once compared to iterator + players.removeIf(player -> !IEntitySelector.notSpectator().test(player) || !entityliving.a(player, 16.0D)); // Paper - removeIf only re-allocates once compared to iterator
+ players.sort(Comparator.comparingDouble(entityliving::h)); + players.sort(Comparator.comparingDouble(entityliving::h));
- entityliving.getClass(); - entityliving.getClass();
@ -105,14 +105,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ EntityHuman nearest = null, nearestTargetable = null; + EntityHuman nearest = null, nearestTargetable = null;
+ for (EntityHuman player : players) { + for (EntityHuman player : players) {
+ if (!Sensor.a(entityliving, player)) { + if (Sensor.a(entityliving, player)) {
+ if (nearest == null) nearest = player; + if (nearest == null) nearest = player;
+ if (IEntitySelector.canAITarget().test(player)) nearestTargetable = player; // Paper - after setting nearestTargetable the loop will definitely break, we do not need a null check. + if (IEntitySelector.canAITarget().test(player)) {
+ nearestTargetable = player;
+ break; // Both variables are assigned, no reason to loop further
+ }
+ } + }
+ if (nearest != null && nearestTargetable != null) break;
+ } + }
+ behaviorcontroller.setMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER, nearest); + behaviorcontroller.setMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER, nearest);
+ behaviorcontroller.setMemory(MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER, nearest != null && IEntitySelector.canAITarget().test(nearest) ? Optional.of(nearest) : Optional.empty()); + behaviorcontroller.setMemory(MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER, nearestTargetable);
+ // Paper end + // Paper end
} }
} }