8062ccb4ed
Upstream has released updates that appear to apply and compile correctly. [Purpur Changes] PurpurMC/Purpur@e86a1b6: Updated Upstream (Paper) [Paper Changes] PaperMC/Paper@a6df4c8: Handle corrupt light data gracefully PaperMC/Paper@ce0a041: [ci skip] Rebuild patches [Paper Changes] PaperMC/Paper@c6aa61e: Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11561) PaperMC/Paper@93b435d: [ci skip] better instructions for patch apply conflict (#11568) PaperMC/Paper@42a1901: Correctly adopt upstream item EAR fix (#11582) PaperMC/Paper@fcb6c72: Correctly pass velocity native compressor (#11509) PaperMC/Paper@99f4bb2: Fix infinite fireworks (#11592) (#11594)
34 lines
1.7 KiB
Diff
34 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: AlphaKR93 <dev@alpha93.kr>
|
|
Date: Wed, 27 Sep 2023 22:11:15 +0900
|
|
Subject: [PATCH] Apply various optimizations
|
|
|
|
[REFERENCE PATCHES]
|
|
Akarin - Swaps the predicate order of collision
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
index d6d9dd17750d7028e13aad539e7b65a7561d9f4b..ae264484f99227f5535c428ebda4860fc8abcc72 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -2342,8 +2342,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
public void playerTouch(Player player) {}
|
|
|
|
public void push(Entity entity) {
|
|
+ if (entity.noPhysics || this.noPhysics) return; // Plazma - Swaps the predicate order of collision
|
|
if (!this.isPassengerOfSameVehicle(entity)) {
|
|
- if (!entity.noPhysics && !this.noPhysics) {
|
|
+ //if (!entity.noPhysics && !this.noPhysics) { // Plazma - Swaps the predicate order of collision
|
|
if (this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper - Collision option for requiring a player participant
|
|
double d0 = entity.getX() - this.getX();
|
|
double d1 = entity.getZ() - this.getZ();
|
|
@@ -2371,8 +2372,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
entity.push(d0, 0.0D, d1);
|
|
}
|
|
}
|
|
-
|
|
- }
|
|
+ //} // Plazma - Swaps the predicate order of collision
|
|
}
|
|
}
|
|
|