OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 15:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix entity collision

Browse source
This commit is contained in:
Owen1212055 2024-12-15 21:16:40 -05:00
parent 59a1f78750
commit 189781f2cf
No known key found for this signature in database
GPG key ID: 2133292072886A30
1 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
paper-server/patches/sources/net/minecraft/world/entity/EntitySelector.java.patch
View file

@ -24,7 +24,7 @@
private EntitySelector() { private EntitySelector() {
} }
@@ -26,15 +_,20 @@ @@ -26,29 +_,34 @@
} }
public static Predicate<Entity> pushableBy(Entity entity) { public static Predicate<Entity> pushableBy(Entity entity) {
@ -38,12 +38,38 @@
return (Predicate<Entity>)(collisionRule == Team.CollisionRule.NEVER return (Predicate<Entity>)(collisionRule == Team.CollisionRule.NEVER
? Predicates.alwaysFalse() ? Predicates.alwaysFalse()
: NO_SPECTATORS.and( : NO_SPECTATORS.and(
pushedEntity -> { - pushedEntity -> {
- if (!pushedEntity.isPushable()) { - if (!pushedEntity.isPushable()) {
+ if (!pushedEntity.isCollidable(ignoreClimbing) || !pushedEntity.canCollideWithBukkit(entity) || !entity.canCollideWithBukkit(pushedEntity)) { // CraftBukkit - collidable API // Paper - Climbing should not bypass cramming gamerule + pushedEntity -> {
+ if (!pushedEntity.isCollidable(ignoreClimbing) || !pushedEntity.canCollideWithBukkit(entity) || !entity.canCollideWithBukkit(pushedEntity)) { // CraftBukkit - collidable API // Paper - Climbing should not bypass cramming gamerule
+ return false;
+ } else if (!entity.level().isClientSide || pushedEntity instanceof Player && ((Player)pushedEntity).isLocalPlayer()) {
+ Team team1 = pushedEntity.getTeam();
+ Team.CollisionRule collisionRule1 = team1 == null ? Team.CollisionRule.ALWAYS : team1.getCollisionRule();
+ if (collisionRule1 == Team.CollisionRule.NEVER || (pushedEntity instanceof Player && !io.papermc.paper.configuration.GlobalConfiguration.get().collisions.enablePlayerCollisions)) { // Paper - Configurable player collision
return false; return false;
- } else if (!entity.level().isClientSide || pushedEntity instanceof Player && ((Player)pushedEntity).isLocalPlayer()) { - } else if (!entity.level().isClientSide || pushedEntity instanceof Player && ((Player)pushedEntity).isLocalPlayer()) {
+ } else if (pushedEntity instanceof Player && entity instanceof Player && !io.papermc.paper.configuration.GlobalConfiguration.get().collisions.enablePlayerCollisions) { // Paper - Configurable player collision - Team team1 = pushedEntity.getTeam();
Team team1 = pushedEntity.getTeam(); - Team.CollisionRule collisionRule1 = team1 == null ? Team.CollisionRule.ALWAYS : team1.getCollisionRule();
Team.CollisionRule collisionRule1 = team1 == null ? Team.CollisionRule.ALWAYS : team1.getCollisionRule(); - if (collisionRule1 == Team.CollisionRule.NEVER) {
if (collisionRule1 == Team.CollisionRule.NEVER) { - return false;
- } else {
- boolean flag = team != null && team.isAlliedTo(team1);
- return (collisionRule != Team.CollisionRule.PUSH_OWN_TEAM && collisionRule1 != Team.CollisionRule.PUSH_OWN_TEAM || !flag)
- && (collisionRule != Team.CollisionRule.PUSH_OTHER_TEAMS && collisionRule1 != Team.CollisionRule.PUSH_OTHER_TEAMS || flag);
- }
} else {
- return false;
+ boolean flag = team != null && team.isAlliedTo(team1);
+ return (collisionRule != Team.CollisionRule.PUSH_OWN_TEAM && collisionRule1 != Team.CollisionRule.PUSH_OWN_TEAM || !flag)
+ && (collisionRule != Team.CollisionRule.PUSH_OTHER_TEAMS && collisionRule1 != Team.CollisionRule.PUSH_OTHER_TEAMS || flag);
}
+ } else {
+ return false;
}
- ));
+ }
+ ));
}
public static Predicate<Entity> notRiding(Entity entity) {