2018-07-19 04:42:43 +00:00
|
|
|
From 39039bfaab07bf1d1c0eec274aac6a6187a8781b Mon Sep 17 00:00:00 2001
|
2016-03-22 04:36:20 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Tue, 22 Mar 2016 00:33:47 -0400
|
|
|
|
Subject: [PATCH] Use a Shared Random for Entities
|
|
|
|
|
|
|
|
Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
2018-07-15 01:53:17 +00:00
|
|
|
index e16579116..c0367df20 100644
|
2016-03-22 04:36:20 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2018-07-21 20:13:27 +00:00
|
|
|
@@ -50,6 +50,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2016-03-22 04:36:20 +00:00
|
|
|
|
|
|
|
// CraftBukkit start
|
|
|
|
private static final int CURRENT_LEVEL = 2;
|
2018-07-21 13:03:10 +00:00
|
|
|
+ // Paper start
|
|
|
|
+ public static Random SHARED_RANDOM = new Random() {
|
|
|
|
+ private boolean locked = false;
|
|
|
|
+ @Override
|
|
|
|
+ public synchronized void setSeed(long seed) {
|
|
|
|
+ if (locked) {
|
|
|
|
+ LogManager.getLogger().error("Ignoring setSeed on Entity.SHARED_RANDOM", new Throwable());
|
|
|
|
+ } else {
|
|
|
|
+ super.setSeed(seed);
|
|
|
|
+ locked = true;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ };
|
|
|
|
+ // Paper end
|
2016-03-22 04:36:20 +00:00
|
|
|
static boolean isLevelAtLeast(NBTTagCompound tag, int level) {
|
|
|
|
return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
|
|
|
|
}
|
2018-07-15 01:53:17 +00:00
|
|
|
@@ -182,7 +183,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2016-03-22 04:36:20 +00:00
|
|
|
this.length = 1.8F;
|
2018-07-15 01:53:17 +00:00
|
|
|
this.aA = 1.0F;
|
|
|
|
this.aB = 1.0F;
|
2016-03-22 04:36:20 +00:00
|
|
|
- this.random = new Random();
|
|
|
|
+ this.random = SHARED_RANDOM; // Paper
|
2016-11-17 02:23:38 +00:00
|
|
|
this.fireTicks = -this.getMaxFireTicks();
|
2016-03-22 04:36:20 +00:00
|
|
|
this.justCreated = true;
|
|
|
|
this.uniqueID = MathHelper.a(this.random);
|
|
|
|
--
|
2018-07-04 07:55:24 +00:00
|
|
|
2.18.0
|
2016-03-22 04:36:20 +00:00
|
|
|
|