Merge branch 'KotlinCore/message-update' into TNTLeague/finish

This commit is contained in:
2024-11-14 22:16:14 +01:00
74 changed files with 554 additions and 335 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ plugins {
}
dependencies {
compileOnly(project(":SpigotCore:SpigotCore_Main"))
compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
compileOnly(libs.nms10)
}
+2 -2
View File
@@ -22,8 +22,8 @@ plugins {
}
dependencies {
compileOnly(project(":CommonCore"))
compileOnly(project(":SpigotCore:SpigotCore_Main"))
compileOnly(project(":CommonCore", "default"))
compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
compileOnly(libs.nms12)
}
+4 -4
View File
@@ -22,10 +22,10 @@ plugins {
}
dependencies {
compileOnly(project(":CommonCore"))
compileOnly(project(":SpigotCore:SpigotCore_Main"))
compileOnly(project(":SpigotCore:SpigotCore_8"))
compileOnly(project(":SpigotCore:SpigotCore_9"))
compileOnly(project(":CommonCore", "default"))
compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
compileOnly(project(":SpigotCore:SpigotCore_8", "default"))
compileOnly(project(":SpigotCore:SpigotCore_9", "default"))
compileOnly(libs.nms14)
compileOnly(libs.worldedit15)
+1 -1
View File
@@ -22,7 +22,7 @@ plugins {
}
dependencies {
compileOnly(project(":SpigotCore:SpigotCore_Main"))
compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
compileOnly(libs.nms15)
}
+3 -3
View File
@@ -26,9 +26,9 @@ tasks.compileJava {
}
dependencies {
compileOnly(project(":CommonCore"))
compileOnly(project(":SpigotCore:SpigotCore_Main"))
compileOnly(project(":SpigotCore:SpigotCore_14"))
compileOnly(project(":CommonCore", "default"))
compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
compileOnly(project(":SpigotCore:SpigotCore_14", "default"))
compileOnly(libs.spigotapi)
compileOnly(libs.nms18)
+3 -3
View File
@@ -22,9 +22,9 @@ plugins {
}
dependencies {
compileOnly(project(":SpigotCore:SpigotCore_Main"))
compileOnly(project(":SpigotCore:SpigotCore_14"))
compileOnly(project(":SpigotCore:SpigotCore_18"))
compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
compileOnly(project(":SpigotCore:SpigotCore_14", "default"))
compileOnly(project(":SpigotCore:SpigotCore_18", "default"))
compileOnly(libs.worldedit15)
compileOnly(libs.nms19)
+1 -1
View File
@@ -22,7 +22,7 @@ plugins {
}
dependencies {
compileOnly(project(":SpigotCore:SpigotCore_Main"))
compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
compileOnly(libs.spigotapi)
+2 -2
View File
@@ -22,8 +22,8 @@ plugins {
}
dependencies {
compileOnly(project(":CommonCore"))
compileOnly(project(":SpigotCore:SpigotCore_Main"))
compileOnly(project(":CommonCore", "default"))
compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
compileOnly(libs.nms8)
compileOnly(libs.worldedit12)
+2 -2
View File
@@ -22,8 +22,8 @@ plugins {
}
dependencies {
compileOnly(project(":SpigotCore:SpigotCore_Main"))
compileOnly(project(":SpigotCore:SpigotCore_8"))
compileOnly(project(":SpigotCore:SpigotCore_Main", "default"))
compileOnly(project(":SpigotCore:SpigotCore_8", "default"))
compileOnly(libs.nms9)
+3 -3
View File
@@ -26,9 +26,9 @@ tasks.compileJava {
}
dependencies {
compileOnly(project(":CommonCore"))
compileOnly(project(":CommandFramework"))
compileOnly(project(":SpigotCore:CRIUDummy"))
compileOnly(project(":CommonCore", "default"))
compileOnly(project(":CommandFramework", "default"))
compileOnly(project(":SpigotCore:CRIUDummy", "default"))
compileOnly(libs.worldedit12)
@@ -36,6 +36,7 @@ import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.plugin.Plugin;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.BiFunction;
import java.util.logging.Level;
@@ -102,7 +103,7 @@ public class TinyProtocol implements Listener {
}
public void addFilter(Class<?> packetType, BiFunction<Player, Object, Object> filter) {
packetFilters.computeIfAbsent(packetType, c -> Collections.synchronizedList(new ArrayList<>(1))).add(filter);
packetFilters.computeIfAbsent(packetType, c -> new CopyOnWriteArrayList<>()).add(filter);
}
public void removeFilter(Class<?> packetType, BiFunction<Player, Object, Object> filter) {