Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot 2014-04-18 17:08:19 +00:00
commit 804a818172
17 changed files with 84 additions and 87 deletions

View file

@ -1,4 +1,4 @@
From 0c0bfe8b1127e609cdaf82697bf7ba4a87af5cd3 Mon Sep 17 00:00:00 2001
From 5bc4b1498c02b4ad26a6ed80e46793426221011f 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 4bcd57e..621f593 100644
index 0b6e9cf..9179baa 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -140,7 +140,7 @@ public abstract class Entity {
@@ -142,7 +142,7 @@ public abstract class Entity {
this.random = new Random();
this.maxFireTicks = 1;
this.justCreated = true;
@ -19,5 +19,5 @@ index 4bcd57e..621f593 100644
this.world = world;
this.setPosition(0.0D, 0.0D, 0.0D);
--
1.8.3.2
1.9.1