From f6823fd8422f83dbbdfb9182d5a9c872c3573e1b Mon Sep 17 00:00:00 2001 From: fullwall Date: Mon, 26 Dec 2022 00:53:38 +0800 Subject: [PATCH] Refresh sleep timers --- .../java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java | 5 ++++- .../java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java | 5 ++++- .../java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java | 5 ++++- .../java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java | 5 ++++- .../main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java index 4d5e94998..18eb344be 100644 --- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java +++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java @@ -1212,7 +1212,10 @@ public class NMSImpl implements NMSBridge { List nearbyPlayers = Lists.newArrayList(Iterables .filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), (p) -> { Long time = meta.getMarker(p.getUniqueId(), entity.getUniqueId().toString()); - return time == null || Math.abs(System.currentTimeMillis() - time) > 5000; + if (time == null || Math.abs(System.currentTimeMillis() - time) > 5000) + return true; + meta.set(p.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis()); + return false; })); if (nearbyPlayers.size() == 0) return; diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java index 503efc66b..7c9e37509 100644 --- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java +++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java @@ -1279,7 +1279,10 @@ public class NMSImpl implements NMSBridge { List nearbyPlayers = Lists.newArrayList(Iterables .filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), (p) -> { Long time = meta.getMarker(p.getUniqueId(), entity.getUniqueId().toString()); - return time == null || Math.abs(System.currentTimeMillis() - time) > 5000; + if (time == null || Math.abs(System.currentTimeMillis() - time) > 5000) + return true; + meta.set(p.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis()); + return false; })); if (nearbyPlayers.size() == 0) return; diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java index fc7274c71..99be88d31 100644 --- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java +++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java @@ -1289,7 +1289,10 @@ public class NMSImpl implements NMSBridge { List nearbyPlayers = Lists.newArrayList(Iterables .filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), (p) -> { Long time = meta.getMarker(p.getUniqueId(), entity.getUniqueId().toString()); - return time == null || Math.abs(System.currentTimeMillis() - time) > 5000; + if (time == null || Math.abs(System.currentTimeMillis() - time) > 5000) + return true; + meta.set(p.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis()); + return false; })); if (nearbyPlayers.size() == 0) return; diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java index 8a8167da4..81bafe6da 100644 --- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java +++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java @@ -1329,7 +1329,10 @@ public class NMSImpl implements NMSBridge { List nearbyPlayers = Lists.newArrayList(Iterables .filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), (p) -> { Long time = meta.getMarker(p.getUniqueId(), entity.getUniqueId().toString()); - return time == null || Math.abs(System.currentTimeMillis() - time) > 5000; + if (time == null || Math.abs(System.currentTimeMillis() - time) > 5000) + return true; + meta.set(p.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis()); + return false; })); if (nearbyPlayers.size() == 0) return; diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java index 1f6774f51..6143be70c 100644 --- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java +++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java @@ -1149,7 +1149,10 @@ public class NMSImpl implements NMSBridge { List nearbyPlayers = Lists.newArrayList(Iterables .filter(CitizensAPI.getLocationLookup().getNearbyPlayers(entity.getLocation(), 64), (p) -> { Long time = meta.getMarker(p.getUniqueId(), entity.getUniqueId().toString()); - return time == null || Math.abs(System.currentTimeMillis() - time) > 5000; + if (time == null || Math.abs(System.currentTimeMillis() - time) > 5000) + return true; + meta.set(p.getUniqueId(), entity.getUniqueId().toString(), System.currentTimeMillis()); + return false; })); if (nearbyPlayers.size() == 0) return;