Skip to content

further optimizations #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Furqit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

further optimizations #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions src/main/java/me/unariginal/novaraids/managers/Raid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ public class Raid {
private final List<UUID> markForDeletion = new ArrayList<>();
private final Map<UUID, Integer> damageByPlayer = new HashMap<>();
private final List<UUID> latestDamage = new ArrayList<>();
private List<Map.Entry<UUID, Integer>> cachedUuidLeaderboard = null;
private List<Map.Entry<String, Integer>> cachedStringLeaderboard = null;
private final List<UUID> fleeingPlayers = new ArrayList<>();
private final Map<Long, List<Task>> tasks = new HashMap<>();
private final Map<UUID, BossBar> playerBossbars = new HashMap<>();
Expand Down Expand Up @@ -275,6 +277,7 @@ public void catchPhase() {
phaseStartTime = nr.server().getOverworld().getTime();

List<ServerPlayerEntity> alreadyCatching = new ArrayList<>();
List<Map.Entry<UUID, Integer>> leaderboard = getDamageLeaderboardUUIDs();
for (CatchPlacement placement : bossInfo.catchSettings().catchPlacements()) {
List<ServerPlayerEntity> playersToReward = new ArrayList<>();
if (StringUtils.isNumeric(placement.place())) {
Expand All @@ -294,7 +297,7 @@ public void catchPhase() {
String percentStr = placement.place().replace("%", "");
if (StringUtils.isNumeric(percentStr)) {
int percent = Integer.parseInt(percentStr);
double positions = getDamageLeaderboard().size() * ((double) percent / 100);
double positions = leaderboard.size() * ((double) percent / 100);
for (int i = 0; i < ((int) positions); i++) {
ServerPlayerEntity player = nr.server().getPlayerManager().getPlayer(getDamageLeaderboard().get(i).getKey());
if (player != null) {
Expand Down Expand Up @@ -390,8 +393,7 @@ public void handleRewards() {
for (DistributionSection categoryReward : categoryRewards) {
boolean overridden = false;
List<Place> places = categoryReward.places();
outer:
for (Place place : places) {
outer: for (Place place : places) {
for (Place overriddenPlacement : overriddenPlacements) {
if (overriddenPlacement.place().equalsIgnoreCase(place.place())) {
overridden = true;
Expand All @@ -410,6 +412,8 @@ public void handleRewards() {
List<Place> places = reward.places();
for (Place place : places) {
List<ServerPlayerEntity> playersToReward = new ArrayList<>();
List<Map.Entry<UUID, Integer>> leaderboard = getDamageLeaderboardUUIDs();

if (StringUtils.isNumeric(place.place())) {
int placeAsInt = Integer.parseInt(place.place());
placeAsInt--;
Expand All @@ -427,7 +431,7 @@ public void handleRewards() {
String percentStr = place.place().replace("%", "");
if (StringUtils.isNumeric(percentStr)) {
int percent = Integer.parseInt(percentStr);
double positions = getDamageLeaderboard().size() * ((double) percent / 100);
double positions = leaderboard.size() * ((double) percent / 100);
for (int i = 0; i < ((int) Math.ceil(positions)); i++) {
ServerPlayerEntity player = nr.server().getPlayerManager().getPlayer(getDamageLeaderboard().get(i).getKey());
if (player != null) {
Expand Down Expand Up @@ -861,9 +865,15 @@ public void updatePlayerDamage(UUID playerUUID, int damage) {
damageByPlayer.put(playerUUID, damage);
latestDamage.remove(playerUUID);
latestDamage.add(playerUUID);
cachedUuidLeaderboard = null;
cachedStringLeaderboard = null;
}

public List<Map.Entry<String, Integer>> getDamageLeaderboard() {
public List<Map.Entry<UUID, Integer>> getDamageLeaderboardUUIDs() {
if (cachedUuidLeaderboard != null) {
return cachedUuidLeaderboard;
}

List<Map.Entry<UUID, Integer>> leaderboardList = new ArrayList<>(damageByPlayer.entrySet());

Map<Integer, Long> damageFrequencies = leaderboardList.stream().collect(
Expand Down Expand Up @@ -908,6 +918,16 @@ public List<Map.Entry<String, Integer>> getDamageLeaderboard() {
}
}
}
cachedUuidLeaderboard = leaderboardList;
return leaderboardList;
}

public List<Map.Entry<String, Integer>> getDamageLeaderboard() {
if (cachedStringLeaderboard != null) {
return cachedStringLeaderboard;
}

List<Map.Entry<UUID, Integer>> leaderboardList = getDamageLeaderboardUUIDs();

List<Map.Entry<String, Integer>> sortedLeaderboard = new ArrayList<>();
UserCache cache = nr.server().getUserCache();
Expand All @@ -920,7 +940,7 @@ public List<Map.Entry<String, Integer>> getDamageLeaderboard() {
}
}
}

cachedStringLeaderboard = sortedLeaderboard;
return sortedLeaderboard;
}

Expand Down
17 changes: 12 additions & 5 deletions src/main/java/me/unariginal/novaraids/managers/TickManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,21 @@ public static void executeTasks() {
Collection<Raid> raids = nr.activeRaids().values();
for (Raid raid : raids) {
if (!raid.getTasks().isEmpty()) {
if (raid.getTasks().get(currentTick) != null) {
if (!raid.getTasks().get(currentTick).isEmpty()) {
for (Task task : raid.getTasks().get(currentTick)) {
task.action().run();
List<Long> tasksToRemove = new ArrayList<>();
for (Long tick : raid.getTasks().keySet()) {
if (tick <= currentTick) {
if (raid.getTasks().get(tick) != null) {
for (Task task : raid.getTasks().get(tick)) {
task.action().run();
}
}
raid.getTasks().remove(currentTick);
tasksToRemove.add(tick);
}
}
for (Long tick : tasksToRemove) {
raid.getTasks().remove(tick);
}

}
}
}
Expand Down