From d0a570aeeecf6efa52edc73145a0f816a55477c4 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 10 Sep 2016 19:39:59 +0200
Subject: [PATCH] Quick fix to get random shuffling.

---
 Mage/src/main/java/mage/cards/CardsImpl.java | 3 +--
 Mage/src/main/java/mage/players/Library.java | 5 +++--
 Mage/src/main/java/mage/util/RandomUtil.java | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Mage/src/main/java/mage/cards/CardsImpl.java b/Mage/src/main/java/mage/cards/CardsImpl.java
index 9719114d329..af2f3a2400c 100644
--- a/Mage/src/main/java/mage/cards/CardsImpl.java
+++ b/Mage/src/main/java/mage/cards/CardsImpl.java
@@ -36,7 +36,6 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 import java.util.Set;
 import java.util.UUID;
 import mage.filter.FilterCard;
@@ -110,7 +109,7 @@ public class CardsImpl extends LinkedHashSet<UUID> implements Cards, Serializabl
 
     @Override
     public Card getRandom(Game game) {
-        if (this.size() == 0) {
+        if (this.isEmpty()) {
             return null;
         }
         UUID[] cards = this.toArray(new UUID[this.size()]);
diff --git a/Mage/src/main/java/mage/players/Library.java b/Mage/src/main/java/mage/players/Library.java
index f8a4d2bae4b..73c258a4df3 100644
--- a/Mage/src/main/java/mage/players/Library.java
+++ b/Mage/src/main/java/mage/players/Library.java
@@ -38,13 +38,13 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import java.util.Set;
 import java.util.UUID;
 import mage.cards.Card;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
 import mage.game.Game;
-import mage.util.RandomUtil;
 
 /**
  *
@@ -52,6 +52,7 @@ import mage.util.RandomUtil;
  */
 public class Library implements Serializable {
 
+    private static Random rnd = new Random();
     private boolean emptyDraw;
     private final Deque<UUID> library = new ArrayDeque<>();
     private final UUID playerId;
@@ -74,7 +75,7 @@ public class Library implements Serializable {
     public void shuffle() {
         UUID[] shuffled = library.toArray(new UUID[0]);
         for (int n = shuffled.length - 1; n > 0; n--) {
-            int r = RandomUtil.nextInt(n);
+            int r = rnd.nextInt(n);
             UUID temp = shuffled[n];
             shuffled[n] = shuffled[r];
             shuffled[r] = temp;
diff --git a/Mage/src/main/java/mage/util/RandomUtil.java b/Mage/src/main/java/mage/util/RandomUtil.java
index 2721d4e0e83..3881b61e4aa 100644
--- a/Mage/src/main/java/mage/util/RandomUtil.java
+++ b/Mage/src/main/java/mage/util/RandomUtil.java
@@ -8,17 +8,17 @@ import java.util.concurrent.ThreadLocalRandom;
  */
 public class RandomUtil {
 
-    private static ThreadLocalRandom random = ThreadLocalRandom.current();
+    private final static ThreadLocalRandom random = ThreadLocalRandom.current();
 
-    public static Random getRandom(){
+    public static Random getRandom() {
         return random;
     }
 
-    public static int nextInt(){
+    public static int nextInt() {
         return random.nextInt();
     }
 
-    public static int nextInt(int max){
+    public static int nextInt(int max) {
         return random.nextInt(max);
     }