diff options
Diffstat (limited to 'patch-remap/og/net/minecraft/world/entity/IEntitySelector.patch')
| -rw-r--r-- | patch-remap/og/net/minecraft/world/entity/IEntitySelector.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/patch-remap/og/net/minecraft/world/entity/IEntitySelector.patch b/patch-remap/og/net/minecraft/world/entity/IEntitySelector.patch new file mode 100644 index 0000000000..625f1d6c14 --- /dev/null +++ b/patch-remap/og/net/minecraft/world/entity/IEntitySelector.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/entity/IEntitySelector.java ++++ b/net/minecraft/world/entity/IEntitySelector.java +@@ -44,7 +44,7 @@ + ScoreboardTeamBase.EnumTeamPush scoreboardteambase_enumteampush = scoreboardteam == null ? ScoreboardTeamBase.EnumTeamPush.ALWAYS : scoreboardteam.getCollisionRule(); + + return (Predicate) (scoreboardteambase_enumteampush == ScoreboardTeamBase.EnumTeamPush.NEVER ? Predicates.alwaysFalse() : IEntitySelector.NO_SPECTATORS.and((entity1) -> { +- if (!entity1.isPushable()) { ++ if (!entity1.canCollideWithBukkit(entity) || !entity.canCollideWithBukkit(entity1)) { // CraftBukkit - collidable API + return false; + } else if (entity.level().isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).isLocalPlayer())) { + return false; |