23 lines
1.3 KiB
Diff
23 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: etil2jz <blanchot.arthur@protonmail.ch>
|
|
Date: Sat, 19 Mar 2022 16:27:30 +0100
|
|
Subject: [PATCH] PaperPR Add more collision code skipping logic
|
|
|
|
Taken from https://github.com/PaperMC/Paper/pull/7581
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index 3174fb7fb678a8a669e28ae10c830ede3855a3ad..a2c348697b0a9a6646647e7946f6720c5897fb3d 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -3442,6 +3442,10 @@ public abstract class LivingEntity extends Entity {
|
|
|
|
protected void pushEntities() {
|
|
// Paper start - don't run getEntities if we're not going to use its result
|
|
+ if (!isCollidable(level.paperConfig().collisions.fixClimbingBypassingCrammingRule)) return;
|
|
+ net.minecraft.world.scores.Team team = getTeam();
|
|
+ if (team != null && team.getCollisionRule() == net.minecraft.world.scores.Team.CollisionRule.NEVER) return;
|
|
+
|
|
int i = this.level.getGameRules().getInt(GameRules.RULE_MAX_ENTITY_CRAMMING);
|
|
if (i <= 0 && level.paperConfig().collisions.maxEntityCollisions <= 0) {
|
|
return;
|