Merge pull request 'bug-88-fix-too-may-packets-kick' (#46) from bug-88 into develop

Reviewed-on: #46
Reviewed-by: oznobys <oznobys@noreply.localhost>

Dockerfile

@@ -9,29 +9,31 @@ ADD ./src ${CONFIG_PATH}
 RUN  mkdir ${DATA_PATH}
 
 
-# Add symlinks to Minecraft default files
-RUN touch ${DATA_PATH}/banned-ips.json && \
-        ln -sf ${DATA_PATH}/banned-ips.json ${CONFIG_PATH} && \
-    touch ${DATA_PATH}/banned-players.json && \
-        ln -sf ${DATA_PATH}/banned-players.json ${CONFIG_PATH} && \
-    mkdir ${DATA_PATH}/logs && \
-        ln -sf ${DATA_PATH}/logs ${CONFIG_PATH} && \
-    touch ${DATA_PATH}/ops.json && \
-        ln -sf ${DATA_PATH}/ops.json ${CONFIG_PATH} && \
-    touch ${DATA_PATH}/usercache.json && \
-        ln -sf ${DATA_PATH}/usercache.json ${CONFIG_PATH} && \
-    touch ${DATA_PATH}/whitelist.json && \
-        ln -sf ${DATA_PATH}/whitelist.json ${CONFIG_PATH} && \
-    mkdir ${DATA_PATH}/world && \
-        ln -sf ${DATA_PATH}/world ${CONFIG_PATH} && \
-    mkdir ${DATA_PATH}/world_nether && \
-        ln -sf ${DATA_PATH}/world_nether ${CONFIG_PATH} && \
-    mkdir ${DATA_PATH}/world_the_end && \
-        ln -sf ${DATA_PATH}/world_the_end ${CONFIG_PATH}
+# Add symlinks to Minecraft Vanilla files
+RUN mkdir ${DATA_PATH}/Vanilla && \ 
+    touch ${DATA_PATH}/Vanilla/banned-ips.json && \
+        ln -sf ${DATA_PATH}/Vanilla/banned-ips.json ${CONFIG_PATH} && \
+    touch ${DATA_PATH}/Vanilla/banned-players.json && \
+        ln -sf ${DATA_PATH}/Vanilla/banned-players.json ${CONFIG_PATH} && \
+    mkdir ${DATA_PATH}/Vanilla/logs && \
+        ln -sf ${DATA_PATH}/Vanilla/logs ${CONFIG_PATH} && \
+    touch ${DATA_PATH}/Vanilla/ops.json && \
+        ln -sf ${DATA_PATH}/Vanilla/ops.json ${CONFIG_PATH} && \
+    touch ${DATA_PATH}/Vanilla/usercache.json && \
+        ln -sf ${DATA_PATH}/Vanilla/usercache.json ${CONFIG_PATH} && \
+    touch ${DATA_PATH}/Vanilla/whitelist.json && \
+        ln -sf ${DATA_PATH}/Vanilla/whitelist.json ${CONFIG_PATH} && \
+    mkdir ${DATA_PATH}/Vanilla/world && \
+        ln -sf ${DATA_PATH}/Vanilla/world ${CONFIG_PATH} && \
+    mkdir ${DATA_PATH}/Vanilla/world_nether && \
+        ln -sf ${DATA_PATH}/Vanilla/world_nether ${CONFIG_PATH} && \
+    mkdir ${DATA_PATH}/Vanilla/world_the_end && \
+        ln -sf ${DATA_PATH}/Vanilla/world_the_end ${CONFIG_PATH}
 
 # Add symlinks to PlasmoVoice files
-RUN touch ${DATA_PATH}/pv-voice_mutes.json && \
-    ln -sf ${DATA_PATH}/pv-voice_mutes.json \
+RUN mkdir ${DATA_PATH}/PlasmoVoice && \
+    touch ${DATA_PATH}/PlasmoVoice/pv-voice_mutes.json && \
+    ln -sf ${DATA_PATH}/PlasmoVoice/pv-voice_mutes.json \
         ${CONFIG_PATH}/plugins/PlasmoVoice/voice_mutes.json
 
 # Add symlinks to SuperVanish files
@@ -144,6 +146,20 @@ ENV DISCORDSRV_DB_PASSWORD=0000
 WORKDIR ${WORKDIR_PATH}/config
 
 CMD \
+    # Remove after migrated
+    mkdir -p ${DATA_PATH}/Vanilla && \
+    if [ -e ${DATA_PATH}/banned-ips.json ]; then mv ${DATA_PATH}/banned-ips.json ${DATA_PATH}/Vanilla; fi && \
+    if [ -e ${DATA_PATH}/banned-players.json ]; then mv ${DATA_PATH}/banned-players.json ${DATA_PATH}/Vanilla; fi && \
+    if [ -e ${DATA_PATH}/logs ]; then mv ${DATA_PATH}/logs ${DATA_PATH}/Vanilla; fi && \
+    if [ -e ${DATA_PATH}/ops.json ]; then mv ${DATA_PATH}/ops.json ${DATA_PATH}/Vanilla; fi && \
+    if [ -e ${DATA_PATH}/usercache.json ]; then mv ${DATA_PATH}/usercache.json ${DATA_PATH}/Vanilla; fi && \
+    if [ -e ${DATA_PATH}/whitelist.json ]; then mv ${DATA_PATH}/whitelist.json ${DATA_PATH}/Vanilla; fi && \
+    if [ -e ${DATA_PATH}/world ]; then mv ${DATA_PATH}/world ${DATA_PATH}/Vanilla; fi && \
+    if [ -e ${DATA_PATH}/world_nether ]; then mv ${DATA_PATH}/world_nether ${DATA_PATH}/Vanilla; fi && \
+    if [ -e ${DATA_PATH}/world_the_end ]; then mv ${DATA_PATH}/world_the_end ${DATA_PATH}/Vanilla; fi && \
+    mkdir -p ${DATA_PATH}/PlasmoVoice && \
+    if [ -e ${DATA_PATH}/pv-voice_mutes.json ]; then mv ${DATA_PATH}/pv-voice_mutes.json ${DATA_PATH}/PlasmoVoice; fi && \
+
     # Create and switch to user with desired UID and GID.
     # All processes that create/change files in ${DATA_PATH}
     # must be run under this user.

src/config/paper-global.yml

@@ -79,8 +79,8 @@ misc:
 packet-limiter:
   all-packets:
     action: KICK
-    interval: 7.0
-    max-packet-rate: 500.0
+    interval: 1.0
+    max-packet-rate: 200.0
   kick-message: <red><lang:disconnect.exceeded_packet_rate>
   overrides:
     ServerboundPlaceRecipePacket:

src/plugins/ViaVersion/config.yml

@@ -41,7 +41,7 @@ suppress-text-component-conversion-warnings: true
 #
 # What is the maximum per second a client can send (Use %pps to display their pps)
 # Use -1 to disable.
-max-pps: 800
+max-pps: -1
 max-pps-kick-msg: You are sending too many packets!
 #
 # We can also kick them if over a period they send over a threshold a certain amount of times.