Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-01-31 20:42:29 +00:00
parent 161ec4151b
commit 99ececedb4
23 changed files with 113 additions and 138 deletions

View File

@@ -1,4 +1,4 @@
From 91fc1d0f8ae1695094f95e8a3bfc4c3975623bc5 Mon Sep 17 00:00:00 2001
From 1bb989ea03ed1de28c3350d7a19e5695f62b5915 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 17 Mar 2013 19:02:50 +1100
Subject: [PATCH] Faster UUID for entities
@@ -6,10 +6,10 @@ Subject: [PATCH] Faster UUID for entities
It is overkill to create a new SecureRandom on each entity create and then use it to make a new Entity ID for every entity instance created. Instead we will just use a pseudo random UUID based off the random instance we already have.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3e3d935..a3a8750 100644
index adf20d9..43fee78 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -138,7 +138,7 @@ public abstract class Entity {
@@ -139,7 +139,7 @@ public abstract class Entity {
this.random = new Random();
this.maxFireTicks = 1;
this.justCreated = true;
@@ -19,5 +19,5 @@ index 3e3d935..a3a8750 100644
this.world = world;
this.setPosition(0.0D, 0.0D, 0.0D);
--
1.8.3.2
1.8.4.msysgit.0