2021-03-16 09:00:00 +11:00
|
|
|
--- a/net/minecraft/world/entity/IEntitySelector.java
|
|
|
|
|
+++ b/net/minecraft/world/entity/IEntitySelector.java
|
2025-03-26 03:05:00 +11:00
|
|
|
@@ -52,7 +52,7 @@
|
|
|
|
|
ScoreboardTeamBase.EnumTeamPush scoreboardteambase_enumteampush = scoreboardteambase == null ? ScoreboardTeamBase.EnumTeamPush.ALWAYS : scoreboardteambase.getCollisionRule();
|
2020-06-25 10:00:00 +10:00
|
|
|
|
2025-03-26 03:05:00 +11:00
|
|
|
return (Predicate<Entity>) (scoreboardteambase_enumteampush == ScoreboardTeamBase.EnumTeamPush.NEVER ? Predicates.alwaysFalse() : IEntitySelector.NO_SPECTATORS.and((entity1) -> {
|
2021-11-22 09:00:00 +11:00
|
|
|
- if (!entity1.isPushable()) {
|
2021-06-11 15:00:00 +10:00
|
|
|
+ if (!entity1.canCollideWithBukkit(entity) || !entity.canCollideWithBukkit(entity1)) { // CraftBukkit - collidable API
|
2020-06-25 10:00:00 +10:00
|
|
|
return false;
|
2025-03-26 03:05:00 +11:00
|
|
|
} else {
|
|
|
|
|
if (entity.level().isClientSide) {
|
