mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-12-28 16:06:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Weak hash map in world attached"

Browse source 
This reverts commit 98a3f759b3.
This commit is contained in:
Jozufozu 2021-11-05 16:45:39 -07:00
parent 98a3f759b3
commit e9404d6de3
2 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java
View file

@ -46,4 +46,13 @@ public class ForgeEvents {
} }
} }
@SubscribeEvent
public static void onUnloadWorld(WorldEvent.Unload event) {
IWorld world = event.getWorld();
if (Backend.isFlywheelWorld(world)) {
WorldAttached.invalidateWorld(world);
}
}
} }

26
src/main/java/com/jozufozu/flywheel/util/WorldAttached.java
View file

@ -1,7 +1,11 @@
package com.jozufozu.flywheel.util; package com.jozufozu.flywheel.util;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.WeakHashMap;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
@ -12,12 +16,30 @@ import net.minecraft.world.IWorld;
public class WorldAttached<T> { public class WorldAttached<T> {
// weak references to prevent leaking hashmaps when a WorldAttached is GC'd during runtime
static List<WeakReference<Map<IWorld, ?>>> allMaps = new ArrayList<>();
private final Map<IWorld, T> attached; private final Map<IWorld, T> attached;
private final Function<IWorld, T> factory; private final Function<IWorld, T> factory;
public WorldAttached(Function<IWorld, T> factory) { public WorldAttached(Function<IWorld, T> factory) {
this.factory = factory; this.factory = factory;
attached = new WeakHashMap<>(); attached = new HashMap<>();
allMaps.add(new WeakReference<>(attached));
}
public static void invalidateWorld(IWorld world) {
Iterator<WeakReference<Map<IWorld, ?>>> i = allMaps.iterator();
while (i.hasNext()) {
Map<IWorld, ?> map = i.next()
.get();
if (map == null) {
// If the map has been GC'd, remove the weak reference
i.remove();
} else {
// Prevent leaks
map.remove(world);
}
}
} }
@Nonnull @Nonnull