From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Aikar 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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index e6917848029b1686e4e3a1a0eadac85eda92518d..3e0f58a928931fd1b3ee32f9dadf65288d8798d6 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -158,6 +158,74 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level; } + // Paper start + public static RandomSource SHARED_RANDOM = new RandomRandomSource(); + private static final class RandomRandomSource extends java.util.Random implements RandomSource { + private boolean locked = false; + + @Override + public synchronized void setSeed(long seed) { + if (locked) { + LOGGER.error("Ignoring setSeed on Entity.SHARED_RANDOM", new Throwable()); + } else { + super.setSeed(seed); + locked = true; + } + } + + @Override + public RandomSource fork() { + return new net.minecraft.world.level.levelgen.LegacyRandomSource(this.nextLong()); + } + + @Override + public net.minecraft.world.level.levelgen.PositionalRandomFactory forkPositional() { + return new net.minecraft.world.level.levelgen.LegacyRandomSource.LegacyPositionalRandomFactory(this.nextLong()); + } + + @Override + public int nextInt(int origin, int bound) { + return RandomSource.super.nextInt(origin, bound); + } + + // these below are added to fix reobf issues that I don't wanna deal with right now + @Override + public long nextLong() { + return super.nextInt(); + } + + @Override + public int nextInt() { + return super.nextInt(); + } + + @Override + public int nextInt(int bound) { + return super.nextInt(bound); + } + + @Override + public boolean nextBoolean() { + return super.nextBoolean(); + } + + @Override + public float nextFloat() { + return super.nextFloat(); + } + + @Override + public double nextDouble() { + return super.nextDouble(); + } + + @Override + public double nextGaussian() { + return super.nextGaussian(); + } + } + // Paper end + private CraftEntity bukkitEntity; public CraftEntity getBukkitEntity() { @@ -345,7 +413,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.bb = Entity.INITIAL_AABB; this.stuckSpeedMultiplier = Vec3.ZERO; this.nextStep = 1.0F; - this.random = RandomSource.create(); + this.random = SHARED_RANDOM; // Paper this.remainingFireTicks = -this.getFireImmuneTicks(); this.fluidHeight = new Object2DoubleArrayMap(2); this.fluidOnEyes = new HashSet(); diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java index 8e63ab510e4c2e458da726ca67be4d3b5274e7b7..a51424d29ac353cf1bec4d1484db0acb63bebba5 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java @@ -46,7 +46,7 @@ public class Squid extends WaterAnimal { public Squid(EntityType type, Level world) { super(type, world); - this.random.setSeed((long) this.getId()); + //this.random.setSeed((long) this.getId()); // Paper - we set the random to shared, do not clobber the seed this.tentacleSpeed = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F; }