mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-18 08:36:13 +01:00
12 lines
818 B
Diff
12 lines
818 B
Diff
|
--- a/net/minecraft/server/IEntitySelector.java
|
||
|
|
+++ b/net/minecraft/server/IEntitySelector.java
|
||
|
|
@@ -37,7 +37,7 @@
|
||
|
|
ScoreboardTeamBase.EnumTeamPush scoreboardteambase_enumteampush = scoreboardteambase == null ? ScoreboardTeamBase.EnumTeamPush.ALWAYS : scoreboardteambase.getCollisionRule();
|
||
|
|
|
||
|
|
return (Predicate) (scoreboardteambase_enumteampush == ScoreboardTeamBase.EnumTeamPush.NEVER ? Predicates.alwaysFalse() : IEntitySelector.g.and((entity1) -> {
|
||
|
|
- if (!entity1.isCollidable()) {
|
||
|
|
+ if (!entity1.canCollideWith(entity) || !entity.canCollideWith(entity1)) { // CraftBukkit - collidable API
|
||
|
|
return false;
|
||
|
|
} else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ey())) {
|
||
|
|
return false;
|