package vg.civcraft.mc.civmodcore.ratelimiting;

import java.util.Map;
import java.util.TreeMap;
import java.util.UUID;

import org.bukkit.entity.Player;

public class RateLimiter {

	private Map<UUID, TokenBucket> buckets;
	private int initialCapacity;
	private int maximumTokens;
	private long refillIntervall;
	private int refillAmount;

	/**
	 * Local constructor to enforce creation through RateLimiting class
	 * 
	 * @param initialCapacity Initial amount of tokens given to new bucket instances
	 * @param maxTokens       Maximum amount of tokens allowed in a bucket
	 * @param refillAmount    Amount added to a bucket per refill
	 * @param refillIntervall How often buckets are refilled in milli seconds
	 */
	RateLimiter(int initialCapacity, int maxTokens, int refillAmount, long refillIntervall) {
		this.buckets = new TreeMap<>();
		this.initialCapacity = initialCapacity;
		this.maximumTokens = maxTokens;
		this.refillIntervall = refillIntervall;
		this.refillAmount = refillAmount;
	}

	/**
	 * Attempts to pull a token for the player with the given UUID
	 * 
	 * @param uuid UUID of the player
	 * @return True if a token was available and successfully consumed, false
	 *         otherwise
	 */
	public boolean pullToken(UUID uuid) {
		TokenBucket bucket = getBucket(uuid);
		synchronized (bucket) {
			bucket.refill(maximumTokens, refillAmount, refillIntervall);
			return bucket.pullToken();
		}
	}

	private TokenBucket getBucket(UUID uuid) {
		synchronized (buckets) {
			TokenBucket bucket = buckets.get(uuid);
			if (bucket == null) {
				bucket = new TokenBucket(initialCapacity);
				buckets.put(uuid, bucket);
			}
			return bucket;
		}
	}

	/**
	 * Gives a player additional tokens up to the maximum amount allowed
	 * 
	 * @param uuid        Player to give tokens
	 * @param tokensToAdd Amount of tokens to add at maximum, must be positive
	 * @return Updated amount of tokens available to the player
	 */
	public int addTokens(UUID uuid, int tokensToAdd) {
		if (tokensToAdd < 0) {
			throw new IllegalArgumentException("Can not add a negative amount of tokens");
		}
		TokenBucket bucket = buckets.get(uuid);
		synchronized (bucket) {
			bucket.refill(maximumTokens, refillAmount, refillIntervall);
			int currentAmount = bucket.getTokensLeft();
			int newAmount = Math.min(maximumTokens, currentAmount + tokensToAdd);
			bucket.setTokens(newAmount);
			return newAmount;
		}
	}

	/**
	 * Attempts to pull a token for the player with the given UUID
	 * 
	 * @param player Bukkit Player object for the player
	 * @return True if a token was available and successfully consumed, false
	 *         otherwise
	 */
	public boolean pullToken(Player player) {
		if (player == null) {
			throw new IllegalArgumentException("Can not retrieve token for null player");
		}
		return pullToken(player.getUniqueId());
	}

	public String toString() {
		return String.format(
				"Rate limiter with initCapacity: %d, maxCapacity: %d, refillInterval: %d, refillAmount: %d",
				initialCapacity, maximumTokens, refillIntervall, refillAmount);
	}
}

@@ -1489,172 +1489,83 @@
 %0A%09%09%09
-TokenBucket bucket = buckets.get(uuid);%0A%09%09%09if (bucket == null) %7B%0A%09%09%09%09bucket = new TokenBucket(initialCapacity);%0A%09%09%09%09buckets.put(uuid, bucket);%0A%09%09%09%7D%0A%09%09%09return bucket
+return buckets.computeIfAbsent(uuid, u -%3E new TokenBucket(initialCapacity))
 ;%0A%09%09
@@ -2027,17 +2027,15 @@
 t = 
-buckets.g
+getBuck
 et(u

Fix bucket initializtion