mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 06:24:06 +01:00
149 lines
6.8 KiB
Diff
149 lines
6.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Byteflux <byte@byteflux.net>
|
||
|
Date: Wed, 2 Mar 2016 11:59:48 -0600
|
||
|
Subject: [PATCH] Optimize explosions
|
||
|
|
||
|
The process of determining an entity's exposure from explosions can be
|
||
|
expensive when there are hundreds or more entities in range.
|
||
|
|
||
|
This patch adds a per-tick cache that is used for storing and retrieving
|
||
|
an entity's exposure during an explosion.
|
||
|
|
||
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
index e6e18f309dc09ea9416ea37dcc697ddc2b571a96..4881b03d470646843bad1bc343eb6a6ab9072d8e 100644
|
||
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
@@ -155,4 +155,10 @@ public class PaperWorldConfig {
|
||
|
disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
|
||
|
log("End credits disabled: " + disableEndCredits);
|
||
|
}
|
||
|
+
|
||
|
+ public boolean optimizeExplosions;
|
||
|
+ private void optimizeExplosions() {
|
||
|
+ optimizeExplosions = getBoolean("optimize-explosions", false);
|
||
|
+ log("Optimize explosions: " + optimizeExplosions);
|
||
|
+ }
|
||
|
}
|
||
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
index 526d6c0fa45bfba92a3f964f72e4965fd5c841c1..901d5497667706c049718dc4fca37a1bc489c465 100644
|
||
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
@@ -1324,6 +1324,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||
|
|
||
|
this.profiler.pop();
|
||
|
this.profiler.pop();
|
||
|
+ worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
|
||
|
}
|
||
|
|
||
|
this.profiler.popPush("connection");
|
||
|
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
|
||
|
index 8d6cd2a5b16d99cb8e754ce04b2d12fee7ffb4d0..db46caaa5ad5f129d313c65c5006cb24853768be 100644
|
||
|
--- a/src/main/java/net/minecraft/world/level/Explosion.java
|
||
|
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
|
||
|
@@ -199,7 +199,7 @@ public class Explosion {
|
||
|
d8 /= d11;
|
||
|
d9 /= d11;
|
||
|
d10 /= d11;
|
||
|
- double d12 = (double) getSeenPercent(vec3d, entity);
|
||
|
+ double d12 = this.getBlockDensity(vec3d, entity); // Paper - Optimize explosions
|
||
|
double d13 = (1.0D - d7) * d12;
|
||
|
|
||
|
// CraftBukkit start
|
||
|
@@ -418,4 +418,84 @@ public class Explosion {
|
||
|
|
||
|
private BlockInteraction() {}
|
||
|
}
|
||
|
+ // Paper start - Optimize explosions
|
||
|
+ private float getBlockDensity(Vec3 vec3d, Entity entity) {
|
||
|
+ if (!this.level.paperConfig.optimizeExplosions) {
|
||
|
+ return getSeenPercent(vec3d, entity);
|
||
|
+ }
|
||
|
+ CacheKey key = new CacheKey(this, entity.getBoundingBox());
|
||
|
+ Float blockDensity = this.level.explosionDensityCache.get(key);
|
||
|
+ if (blockDensity == null) {
|
||
|
+ blockDensity = getSeenPercent(vec3d, entity);
|
||
|
+ this.level.explosionDensityCache.put(key, blockDensity);
|
||
|
+ }
|
||
|
+
|
||
|
+ return blockDensity;
|
||
|
+ }
|
||
|
+
|
||
|
+ static class CacheKey {
|
||
|
+ private final Level world;
|
||
|
+ private final double posX, posY, posZ;
|
||
|
+ private final double minX, minY, minZ;
|
||
|
+ private final double maxX, maxY, maxZ;
|
||
|
+
|
||
|
+ public CacheKey(Explosion explosion, AABB aabb) {
|
||
|
+ this.world = explosion.level;
|
||
|
+ this.posX = explosion.x;
|
||
|
+ this.posY = explosion.y;
|
||
|
+ this.posZ = explosion.z;
|
||
|
+ this.minX = aabb.minX;
|
||
|
+ this.minY = aabb.minY;
|
||
|
+ this.minZ = aabb.minZ;
|
||
|
+ this.maxX = aabb.maxX;
|
||
|
+ this.maxY = aabb.maxY;
|
||
|
+ this.maxZ = aabb.maxZ;
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public boolean equals(Object o) {
|
||
|
+ if (this == o) return true;
|
||
|
+ if (o == null || getClass() != o.getClass()) return false;
|
||
|
+
|
||
|
+ CacheKey cacheKey = (CacheKey) o;
|
||
|
+
|
||
|
+ if (Double.compare(cacheKey.posX, posX) != 0) return false;
|
||
|
+ if (Double.compare(cacheKey.posY, posY) != 0) return false;
|
||
|
+ if (Double.compare(cacheKey.posZ, posZ) != 0) return false;
|
||
|
+ if (Double.compare(cacheKey.minX, minX) != 0) return false;
|
||
|
+ if (Double.compare(cacheKey.minY, minY) != 0) return false;
|
||
|
+ if (Double.compare(cacheKey.minZ, minZ) != 0) return false;
|
||
|
+ if (Double.compare(cacheKey.maxX, maxX) != 0) return false;
|
||
|
+ if (Double.compare(cacheKey.maxY, maxY) != 0) return false;
|
||
|
+ if (Double.compare(cacheKey.maxZ, maxZ) != 0) return false;
|
||
|
+ return world.equals(cacheKey.world);
|
||
|
+ }
|
||
|
+
|
||
|
+ @Override
|
||
|
+ public int hashCode() {
|
||
|
+ int result;
|
||
|
+ long temp;
|
||
|
+ result = world.hashCode();
|
||
|
+ temp = Double.doubleToLongBits(posX);
|
||
|
+ result = 31 * result + (int) (temp ^ (temp >>> 32));
|
||
|
+ temp = Double.doubleToLongBits(posY);
|
||
|
+ result = 31 * result + (int) (temp ^ (temp >>> 32));
|
||
|
+ temp = Double.doubleToLongBits(posZ);
|
||
|
+ result = 31 * result + (int) (temp ^ (temp >>> 32));
|
||
|
+ temp = Double.doubleToLongBits(minX);
|
||
|
+ result = 31 * result + (int) (temp ^ (temp >>> 32));
|
||
|
+ temp = Double.doubleToLongBits(minY);
|
||
|
+ result = 31 * result + (int) (temp ^ (temp >>> 32));
|
||
|
+ temp = Double.doubleToLongBits(minZ);
|
||
|
+ result = 31 * result + (int) (temp ^ (temp >>> 32));
|
||
|
+ temp = Double.doubleToLongBits(maxX);
|
||
|
+ result = 31 * result + (int) (temp ^ (temp >>> 32));
|
||
|
+ temp = Double.doubleToLongBits(maxY);
|
||
|
+ result = 31 * result + (int) (temp ^ (temp >>> 32));
|
||
|
+ temp = Double.doubleToLongBits(maxZ);
|
||
|
+ result = 31 * result + (int) (temp ^ (temp >>> 32));
|
||
|
+ return result;
|
||
|
+ }
|
||
|
+ }
|
||
|
+ // Paper end
|
||
|
}
|
||
|
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
||
|
index 870843254d1c1fc49bc101a49cdf9d300ae3ca1b..f71b56fa079e2c7b2123061a8e1a7cb41935bab6 100644
|
||
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
||
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
||
|
@@ -136,6 +136,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
||
|
private org.spigotmc.TickLimiter entityLimiter;
|
||
|
private org.spigotmc.TickLimiter tileLimiter;
|
||
|
private int tileTickPosition;
|
||
|
+ public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
|
||
|
|
||
|
public CraftWorld getWorld() {
|
||
|
return this.world;
|