diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java index 869f37c6..adfd90ae 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java +++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java @@ -345,11 +345,12 @@ public class PluginMessage extends BasicListener { "frozenlib:remove_screen_shakes_packet", "frozenlib:screen_shake_entity_packet", "frozenlib:screen_shake_packet", "frozenlib:spotting_icon_packet", "frozenlib:wind_disturbance_packet", "frozenlib:spotting_icon_remove_packet", "frozenlib:starting_moving_restriction_looping_sound_packet", - "imm_ptl:remote_cts" //https://www.curseforge.com/minecraft/mc-mods/immersive-portals-mod + "imm_ptl:remote_cts", //https://www.curseforge.com/minecraft/mc-mods/immersive-portals-mod + "distant_horizons:message", "tcdcommons:cpn" )) channelRegisterHandlers.put(channel, player -> {}); - channelRegisterHandlers.put(Lunar.CHANNEL, lunar::sendRestrictions); + //channelRegisterHandlers.put(Lunar.CHANNEL, lunar::sendRestrictions); channelRegisterHandlers.put(Feather.CHANNEL, new Feather()::sendRestrictions); channelRegisterHandlers.put("openboatutils:settings", player -> send(player, "openboatutils:settings", new byte[] { 0, 0 })); //https://github.com/o7Moon/OpenBoatUtils/wiki/Packets (Reset packet) channelRegisterHandlers.put("itemswapper:disable", player -> send(player, "itemswapper:disable", new byte[]{ 0 })); //https://github.com/tr7zw/ItemSwapper/blob/main/src/main/java/dev/tr7zw/itemswapper/packets/DisableModPayload.java @@ -385,7 +386,8 @@ public class PluginMessage extends BasicListener { "flashback:clear_particles", "flashback:set_border_lerp_start_time", "flashback:remote_select_hotbar_slot", // https://github.com/Moulberry/Flashback/tree/master/src/main/java/com/moulberry/flashback/packet - "flashback:clear_entities" // https://github.com/Moulberry/Flashback + "flashback:clear_entities", // https://github.com/Moulberry/Flashback + Lunar.CHANNEL )) channelRegisterHandlers.put(channel, player -> { if (!SteamwarUser.get(player.getUniqueId()).hasPerm(UserPerm.RESTRICTED_MODS)) { @@ -406,7 +408,7 @@ public class PluginMessage extends BasicListener { "axiom:annotation_update", "axiom:redo_handshake", "axiom:register_custom_items", "axiom:register_custom_block_v2", "axiom:register_world" ); - registerBiDirPassthrough("axiom:handle_big_payload", "axiom:set_editor_views"); + registerBiDirPassthrough("axiom:handle_big_payload", "axiom:set_editor_views", "axiom:update_available_dispatch_sends"); for(String channel : Arrays.asList( "axiom:hello", "axiom:set_gamemode", "axiom:set_fly_speed", "axiom:set_world_time", "axiom:set_world_property", "axiom:set_block", "axiom:set_hotbar_slot", "axiom:switch_active_hotbar", diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java b/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java index 5fac27f0..25482420 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java +++ b/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java @@ -56,7 +56,7 @@ public class Hostname extends BasicListener { public Hostname() { knownHostnames.add("steamwar.de"); - knownHostnames.add("78.31.71.136"); + knownHostnames.add("178.63.72.88"); knownHostnames.add("memewar.de"); // Chaoscaot knownHostnames.add("dampfkrieg.de"); // Chaoscaot knownHostnames.add("steamshrimp.de"); // Chaoscaot diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/Lunar.java b/VelocityCore/src/de/steamwar/velocitycore/mods/Lunar.java index 254354bc..fbd7497c 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/mods/Lunar.java +++ b/VelocityCore/src/de/steamwar/velocitycore/mods/Lunar.java @@ -29,7 +29,10 @@ import com.lunarclient.apollo.player.v1.PlayerHandshakeMessage; import com.velocitypowered.api.event.connection.PluginMessageEvent; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; +import de.steamwar.messages.Chatter; import de.steamwar.sql.Mod; +import de.steamwar.sql.SteamwarUser; +import de.steamwar.sql.UserPerm; import de.steamwar.velocitycore.VelocityCore; import java.util.ArrayList; @@ -73,6 +76,11 @@ public class Lunar { } private void handle(Player player, PlayerHandshakeMessage packet) { + if (!SteamwarUser.get(player.getUniqueId()).hasPerm(UserPerm.RESTRICTED_MODS)) { + Chatter.disconnect(player).prefixless("MOD_YELLOW_SING", "Lunar"); + return; + } + List mods = new ArrayList<>(); for(ModMessage mod : packet.getInstalledModsList()) {