9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-21 07:49:18 +00:00

Update Upstream

This commit is contained in:
NONPLAYT
2022-11-15 00:34:04 +03:00
parent 79db6e6c76
commit 89cacb308a
17 changed files with 68 additions and 63 deletions

View File

@@ -1,15 +1,15 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NONPLAY <admin@bxteam.gq>
Date: Sat, 12 Nov 2022 22:59:14 +0300
From: etil2jz <81570777+etil2jz@users.noreply.github.com>
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 d6f7fd9dc4804e7565c89a9cbb0948f256559f03..24484d985929c7860aa08dbfca6df113086d2ed0 100644
index c0e316582e085873c05a76c16e612eabd2e8cf2a..dd881ca1460ad3d1f17b40969a872c3226d9d0c9 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3470,6 +3470,10 @@ public abstract class LivingEntity extends Entity {
@@ -3466,6 +3466,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