Skip to content

Commit

Permalink
refactor: adhere to personal style
Browse files Browse the repository at this point in the history
  • Loading branch information
ItsNathanG committed Mar 19, 2018
1 parent 83e9768 commit bcc51d1
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions src/main/java/me/itsnathang/placeholders/Geolocation.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package me.itsnathang.placeholders;

import me.clip.placeholderapi.expansion.Cleanable;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.entity.Player;

import java.net.InetSocketAddress;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;

public class Geolocation extends PlaceholderExpansion implements Cleanable {

Expand Down Expand Up @@ -31,19 +35,20 @@ public String getVersion() {

@Override
public String onPlaceholderRequest(Player player, String identifier) {
if (cache.containsKey(player.getUuid())) {
if (cache.containsKey(player.getUniqueId()))
return cache.get(player.getUniqueId()).getData(identifier);
}

InetSocketAddress ip = player.getAddress();
LocationInfo info = new LocationInfo(ip);
if (info.isValid()) {

if (info.isValid())
cache.put(player.getUniqueId(), info);
}

return info.getData(identifier);
}

@Override
public void clean(Player p) {
public void cleanup(Player p) {
cache.remove(p.getUniqueId());
}
}

0 comments on commit bcc51d1

Please sign in to comment.