From 28ca2a7a3d362728aae3dbf31914ea749202a4d7 Mon Sep 17 00:00:00 2001 From: Tamion <70228790+notTamion@users.noreply.github.com> Date: Sun, 20 Oct 2024 14:27:24 +0200 Subject: [PATCH] ArrayList --- ...atch => 1066-Add-proper-async-player-disconnections.patch} | 0 ...ix-ProjectileHitEvent-not-called-for-multiple-HitRe.patch} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename patches/server/{1067-Add-proper-async-player-disconnections.patch => 1066-Add-proper-async-player-disconnections.patch} (100%) rename patches/server/{1066-Fix-ProjectileHitEvent-not-called-for-multiple-HitRe.patch => 1067-Fix-ProjectileHitEvent-not-called-for-multiple-HitRe.patch} (99%) diff --git a/patches/server/1067-Add-proper-async-player-disconnections.patch b/patches/server/1066-Add-proper-async-player-disconnections.patch similarity index 100% rename from patches/server/1067-Add-proper-async-player-disconnections.patch rename to patches/server/1066-Add-proper-async-player-disconnections.patch diff --git a/patches/server/1066-Fix-ProjectileHitEvent-not-called-for-multiple-HitRe.patch b/patches/server/1067-Fix-ProjectileHitEvent-not-called-for-multiple-HitRe.patch similarity index 99% rename from patches/server/1066-Fix-ProjectileHitEvent-not-called-for-multiple-HitRe.patch rename to patches/server/1067-Fix-ProjectileHitEvent-not-called-for-multiple-HitRe.patch index e03e487848..014a4068d4 100644 --- a/patches/server/1066-Fix-ProjectileHitEvent-not-called-for-multiple-HitRe.patch +++ b/patches/server/1067-Fix-ProjectileHitEvent-not-called-for-multiple-HitRe.patch @@ -240,7 +240,7 @@ index 8575941fd238750c5d56843989a48bcbde2d8a88..498b7d41e054903d3bfab66f86a9da7c double d1 = this.getY() + vec3d.y; double d2 = this.getZ() + vec3d.z; diff --git a/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java b/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java -index e43b3b37a3afc903f057d49d34339f8022274d3e..dcbb54b19a88db7c4eca761ccba7d6e9b333fd11 100644 +index e43b3b37a3afc903f057d49d34339f8022274d3e..9e55360fa4f3449e391ae5262187dce686654202 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java +++ b/src/main/java/net/minecraft/world/entity/projectile/ProjectileUtil.java @@ -159,4 +159,51 @@ public final class ProjectileUtil { @@ -261,7 +261,7 @@ index e43b3b37a3afc903f057d49d34339f8022274d3e..dcbb54b19a88db7c4eca761ccba7d6e9 + } + } + -+ return entities.values().stream().map(EntityHitResult::new).collect(java.util.stream.Collectors.toList()); ++ return entities.values().stream().map(EntityHitResult::new).collect(java.util.stream.Collectors.toCollection(java.util.ArrayList::new)); + } + + public static java.util.List getHitResultsOnMoveVector(Entity entity, Predicate predicate) {