mirror of
https://github.com/CitizensDev/Citizens2.git
synced 2024-11-05 18:30:26 +01:00
Merge branch 'master' of github.com:CitizensDev/Citizens2
This commit is contained in:
commit
ffd8b5e8d3
2
pom.xml
2
pom.xml
@ -11,7 +11,7 @@
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<craftbukkit.version>1.9-R0.1-SNAPSHOT</craftbukkit.version>
|
||||
<craftbukkit.version>1.9-SNAPSHOT</craftbukkit.version>
|
||||
<citizensapi.version>2.0.17-SNAPSHOT</citizensapi.version>
|
||||
<vault.version>1.5.4</vault.version>
|
||||
<powermock.version>1.4.12</powermock.version>
|
||||
|
@ -22,17 +22,17 @@ import java.util.concurrent.locks.ReentrantLock;
|
||||
* <p>
|
||||
* Very fast pseudo random number generator. See
|
||||
* <a href= "http://school.anhb.uwa.edu.au/personalpages/kwessen/shared/Marsaglia03.html" >this page</a> for a
|
||||
* description. This RNG has a period of about 2^160, which is not as long as the {@link MersenneTwisterRNG} but it is
|
||||
* description. This RNG has a period of about 2^160, which is not as long as the MersenneTwisterRNG but it is
|
||||
* faster.
|
||||
* </p>
|
||||
*
|
||||
*
|
||||
* <p>
|
||||
* <em>NOTE: Because instances of this class require 160-bit seeds, it is not
|
||||
* possible to seed this RNG using the {@link #setSeed(long)} method inherited
|
||||
* from {@link Random}. Calls to this method will have no effect.
|
||||
* Instead the seed must be set by a constructor.</em>
|
||||
* </p>
|
||||
*
|
||||
*
|
||||
* @author Daniel Dyer
|
||||
* @since 1.2
|
||||
*/
|
||||
@ -52,9 +52,6 @@ public class XORShiftRNG extends Random {
|
||||
|
||||
/**
|
||||
* Creates an RNG and seeds it with the specified seed data.
|
||||
*
|
||||
* @param seed
|
||||
* The seed data used to initialise the RNG.
|
||||
*/
|
||||
public XORShiftRNG() {
|
||||
this.seed = new byte[SEED_SIZE_BYTES];
|
||||
@ -105,7 +102,7 @@ public class XORShiftRNG extends Random {
|
||||
/**
|
||||
* Take four bytes from the specified position in the specified block and convert them into a 32-bit int, using the
|
||||
* big-endian convention.
|
||||
*
|
||||
*
|
||||
* @param bytes
|
||||
* The data to read from.
|
||||
* @param offset
|
||||
@ -120,7 +117,7 @@ public class XORShiftRNG extends Random {
|
||||
/**
|
||||
* Convert an array of bytes into an array of ints. 4 bytes from the input data map to a single int in the output
|
||||
* data.
|
||||
*
|
||||
*
|
||||
* @param bytes
|
||||
* The data to read from.
|
||||
* @return An array of 32-bit integers constructed from the data.
|
||||
@ -136,4 +133,4 @@ public class XORShiftRNG extends Random {
|
||||
}
|
||||
return ints;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user