core/testserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Trigary 2021-03-10 12:24:20 +01:00 committed by Mariell Hoversholm
parent 4d287e31cc
commit 0b25bacfc7
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Spigot-Server-Patches/0680-Remove-streams-from-SensorNearest.patch
View file

@ -73,10 +73,10 @@ index f6568a54ab85bc3a682f6fbb19dda7a783625bbe..b3388d4a665e8f91083a2e746482a9f0
@Override @Override
diff --git a/src/main/java/net/minecraft/server/SensorNearestPlayers.java b/src/main/java/net/minecraft/server/SensorNearestPlayers.java diff --git a/src/main/java/net/minecraft/server/SensorNearestPlayers.java b/src/main/java/net/minecraft/server/SensorNearestPlayers.java
index 904a6d5ac61d2ac81f1057068383e9ab432852db..ee7b7a9fe393137171bbe2af5c7e3b864cb3aa99 100644 index 904a6d5ac61d2ac81f1057068383e9ab432852db..ae946619f10a757171e4217e414d6a5248a45494 100644
--- a/src/main/java/net/minecraft/server/SensorNearestPlayers.java --- a/src/main/java/net/minecraft/server/SensorNearestPlayers.java
+++ b/src/main/java/net/minecraft/server/SensorNearestPlayers.java +++ b/src/main/java/net/minecraft/server/SensorNearestPlayers.java
@@ -19,22 +19,24 @@ public class SensorNearestPlayers extends Sensor<EntityLiving> { @@ -19,22 +19,26 @@ public class SensorNearestPlayers extends Sensor<EntityLiving> {
@Override @Override
protected void a(WorldServer worldserver, EntityLiving entityliving) { protected void a(WorldServer worldserver, EntityLiving entityliving) {
@ -85,7 +85,7 @@ index 904a6d5ac61d2ac81f1057068383e9ab432852db..ee7b7a9fe393137171bbe2af5c7e3b86
- }); - });
+ // 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 904a6d5ac61d2ac81f1057068383e9ab432852db..ee7b7a9fe393137171bbe2af5c7e3b86
+ +
+ 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
} }
} }