mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-22 16:39:22 +00:00
116 lines
6.2 KiB
Diff
116 lines
6.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MrHua269 <wangxyper@163.com>
|
|
Date: Wed, 23 Aug 2023 14:21:16 -0400
|
|
Subject: [PATCH] Cache minecart vehicle collision results
|
|
|
|
Co-authored-by: MrHua269 <wangxyper@163.com>
|
|
|
|
Cache minecart vehicle collision results to prevent lag causing by massive stacked minecart
|
|
The known issue: entity can't enter the minecart after enabling this!
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
|
index eb5bd5cfd131042e366872bf599a315d83dc732b..024000e5b1c36e72a4b6cfff233d7a64cdb80758 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
|
@@ -5,6 +5,8 @@ import com.google.common.collect.ImmutableMap;
|
|
import com.google.common.collect.Maps;
|
|
import com.google.common.collect.UnmodifiableIterator;
|
|
import com.mojang.datafixers.util.Pair;
|
|
+
|
|
+import java.util.ArrayList;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
@@ -294,6 +296,15 @@ public abstract class AbstractMinecart extends VehicleEntity {
|
|
return this.flipped ? this.getDirection().getOpposite().getClockWise() : this.getDirection().getClockWise();
|
|
}
|
|
|
|
+ // Leaf start - Cache minecart vehicle collision results
|
|
+ private List<Entity> lastCollideCache = new ArrayList<>();
|
|
+ private void checkAndUpdateCache(boolean ride) {
|
|
+ if (this.tickCount % 30 == 0) {
|
|
+ this.lastCollideCache = ride ? this.level().getEntities((Entity) this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D), EntitySelector.pushableBy(this)) : this.level().getEntities(this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D));
|
|
+ }
|
|
+ }
|
|
+ // Leaf end
|
|
+
|
|
@Override
|
|
public void tick() {
|
|
// Purpur start
|
|
@@ -390,14 +401,13 @@ public abstract class AbstractMinecart extends VehicleEntity {
|
|
}
|
|
// CraftBukkit end
|
|
if (this.getMinecartType() == AbstractMinecart.Type.RIDEABLE && this.getDeltaMovement().horizontalDistanceSqr() > 0.01D) {
|
|
- List<Entity> list = this.level().getEntities((Entity) this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D), EntitySelector.pushableBy(this));
|
|
+ // Leaf start - Cache minecart vehicle collision results
|
|
+ if (org.dreeam.leaf.config.modules.opt.CacheMinecartCollision.enabled) this.checkAndUpdateCache(true);
|
|
+ List<Entity> list = org.dreeam.leaf.config.modules.opt.CacheMinecartCollision.enabled ? this.lastCollideCache : this.level().getEntities((Entity) this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D), EntitySelector.pushableBy(this));; // Leaf - Cache minecart vehicle collision results
|
|
|
|
if (!list.isEmpty()) {
|
|
- Iterator iterator = list.iterator();
|
|
-
|
|
- while (iterator.hasNext()) {
|
|
- Entity entity = (Entity) iterator.next();
|
|
|
|
+ for (Entity entity : list) {
|
|
if (!(entity instanceof Player) && !(entity instanceof IronGolem) && !(entity instanceof AbstractMinecart) && !this.isVehicle() && !entity.isPassenger()) {
|
|
// CraftBukkit start
|
|
VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent(vehicle, entity.getBukkitEntity());
|
|
@@ -424,11 +434,10 @@ public abstract class AbstractMinecart extends VehicleEntity {
|
|
}
|
|
}
|
|
} else {
|
|
- Iterator iterator1 = this.level().getEntities(this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D)).iterator();
|
|
-
|
|
- while (iterator1.hasNext()) {
|
|
- Entity entity1 = (Entity) iterator1.next();
|
|
+ if (org.dreeam.leaf.config.modules.opt.CacheMinecartCollision.enabled) this.checkAndUpdateCache(false); // Leaf - Cache minecart vehicle collision results
|
|
+ List<Entity> list2 = org.dreeam.leaf.config.modules.opt.CacheMinecartCollision.enabled ? this.lastCollideCache : this.level().getEntities(this, this.getBoundingBox().inflate(0.20000000298023224D, 0.0D, 0.20000000298023224D));; // Leaf - Cache minecart vehicle collision results
|
|
|
|
+ for (Entity entity1 : list2) {
|
|
if (!this.hasPassenger(entity1) && entity1.isPushable() && entity1 instanceof AbstractMinecart) {
|
|
// CraftBukkit start
|
|
VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent(vehicle, entity1.getBukkitEntity());
|
|
@@ -442,6 +451,7 @@ public abstract class AbstractMinecart extends VehicleEntity {
|
|
}
|
|
}
|
|
}
|
|
+ // Leaf end
|
|
|
|
this.updateInWaterStateAndDoFluidPushing();
|
|
if (this.isInLava()) {
|
|
diff --git a/src/main/java/org/dreeam/leaf/config/modules/opt/CacheMinecartCollision.java b/src/main/java/org/dreeam/leaf/config/modules/opt/CacheMinecartCollision.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..edd7f1440751f535a209a6762c152532f2bb0427
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/dreeam/leaf/config/modules/opt/CacheMinecartCollision.java
|
|
@@ -0,0 +1,28 @@
|
|
+package org.dreeam.leaf.config.modules.opt;
|
|
+
|
|
+import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
|
+import org.dreeam.leaf.config.ConfigInfo;
|
|
+import org.dreeam.leaf.config.EnumConfigCategory;
|
|
+import org.dreeam.leaf.config.IConfigModule;
|
|
+
|
|
+public class CacheMinecartCollision implements IConfigModule {
|
|
+
|
|
+
|
|
+ @Override
|
|
+ public EnumConfigCategory getCategory() {
|
|
+ return EnumConfigCategory.PERFORMANCE;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public String getBaseName() {
|
|
+ return "cache_minecart_collision";
|
|
+ }
|
|
+
|
|
+ @ConfigInfo(baseName = "enabled")
|
|
+ public static boolean enabled = false;
|
|
+
|
|
+ @Override
|
|
+ public void onLoaded(CommentedFileConfig config) {
|
|
+ config.setComment("performance.cache_minecart_collision", "Cache the minecart collision result to prevent massive stacked minecart lag the server.");
|
|
+ }
|
|
+}
|