GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-29 11:39:16 +00:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/master' into feature/micronaut-inject

Browse Source 
# Conflicts:
#	build-logic/src/main/kotlin/Versions.kt
#	bungee/build.gradle.kts
#	core/build.gradle.kts
#	core/src/main/java/org/geysermc/floodgate/core/util/Metrics.java
#	database/mysql/build.gradle.kts
#	spigot/src/main/java/org/geysermc/floodgate/spigot/pluginmessage/SpigotSkinApplier.java
#	spigot/src/main/resources/plugin.yml
This commit is contained in:
Tim203
2023-05-03 11:26:05 +02:00
parent dc3a6e84c3 2702bc3e83
commit b759f0b493
17 changed files with 138 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/geysermc/floodgate/core/pluginmessage/channel/FormChannel.java
View File

@@ -27,6 +27,7 @@ package org.geysermc.floodgate.core.pluginmessage.channel;
import com.google.common.base.Charsets;
import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
import it.unimi.dsi.fastutil.shorts.Short2ObjectMaps;
import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap;
import jakarta.inject.Inject;
import java.util.UUID;
@@ -41,7 +42,8 @@ import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel;
public class FormChannel implements PluginMessageChannel {
private final FormDefinitions formDefinitions = FormDefinitions.instance();
private final Short2ObjectMap<Form> storedForms = new Short2ObjectOpenHashMap<>();
private final Short2ObjectMap<Form> storedForms =
Short2ObjectMaps.synchronize(new Short2ObjectOpenHashMap<>());
private final AtomicInteger nextFormId = new AtomicInteger(0);
@Inject PluginMessageUtils pluginMessageUtils;

7
core/src/main/java/org/geysermc/floodgate/core/util/Metrics.java
View File

@@ -25,6 +25,7 @@
package org.geysermc.floodgate.core.util;
import io.micronaut.runtime.event.annotation.EventListener;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
@@ -43,6 +44,7 @@ import org.geysermc.floodgate.api.FloodgateApi;
import org.geysermc.floodgate.api.logger.FloodgateLogger;
import org.geysermc.floodgate.core.config.FloodgateConfig;
import org.geysermc.floodgate.core.config.FloodgateConfig.MetricsConfig;
import org.geysermc.floodgate.core.event.lifecycle.ShutdownEvent;
import org.geysermc.floodgate.core.platform.util.PlatformUtils;
@Singleton
@@ -150,4 +152,9 @@ public final class Metrics {
builder.appendField("osVersion", System.getProperty("os.version"));
builder.appendField("coreCount", Runtime.getRuntime().availableProcessors());
}
@EventListener
public void onShutdown(ShutdownEvent ignored) {
metricsBase.shutdown();
}
}