Skip to content
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

perf: Faster world lookup #4420

Closed
wants to merge 2 commits into from
+3 −9
Closed

perf: Faster world lookup #4420

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75d983f
Faster Bukkit world lookup using an IdentityHashMap and computeIfAbsent
Vrganj May 5, 2024
d77bc90
Merge remote-tracking branch 'origin/main' into perf/faster-world-lookup
Vrganj May 5, 2024
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
12 changes: 3 additions & 9 deletions Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitWorld.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
*/
package com.plotsquared.bukkit.util;

import com.google.common.collect.Maps;
import com.plotsquared.core.location.World;
import org.bukkit.Bukkit;
import org.checkerframework.checker.nullness.qual.NonNull;

import java.util.IdentityHashMap;
import java.util.Map;

public class BukkitWorld implements World<org.bukkit.World> {

private static final Map<String, BukkitWorld> worldMap = Maps.newHashMap();
private static final Map<org.bukkit.World, BukkitWorld> worldMap = new IdentityHashMap<>();
private static final boolean HAS_MIN_Y;

static {
Expand Down Expand Up @@ -68,13 +68,7 @@ private BukkitWorld(final org.bukkit.World world) {
* @return World instance
*/
public static @NonNull BukkitWorld of(final org.bukkit.World world) {
BukkitWorld bukkitWorld = worldMap.get(world.getName());
if (bukkitWorld != null && bukkitWorld.getPlatformWorld().equals(world)) {
return bukkitWorld;
}
bukkitWorld = new BukkitWorld(world);
worldMap.put(world.getName(), bukkitWorld);
return bukkitWorld;
return worldMap.computeIfAbsent(world, BukkitWorld::new);
}

/**
Expand Down
Loading