Add more patches back

This commit is contained in:
Arthur Blanchot
2022-06-28 21:25:08 +02:00
parent f0c1c0f5f0
commit 0750e5fe34
32 changed files with 1213 additions and 38 deletions

View File

@@ -1,22 +0,0 @@
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 a03930ebdb3ebc766db4414eee38c6aa4c39fc56..08e50fb20be2f1a4266c1bfe59eb8fe83c6942ab 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3439,6 +3439,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;