diff --git a/ansible/files/paper-config/spigot.yml b/ansible/files/paper-config/spigot.yml index 59583580a..4bdf5fa20 100644 --- a/ansible/files/paper-config/spigot.yml +++ b/ansible/files/paper-config/spigot.yml @@ -18,7 +18,7 @@ settings: save-user-cache-on-stop-only: false moved-wrongly-threshold: 1.0625 moved-too-quickly-multiplier: 50.0 - timeout-time: 60 + timeout-time: ${WATCHDOG_TIMEOUT_TIME} restart-on-crash: false restart-script: ./start.sh netty-threads: 4 diff --git a/ansible/src/paper-plugins/ViaBackwards-5.0.1.jar b/ansible/src/paper-plugins/ViaBackwards-5.0.3.jar similarity index 64% rename from ansible/src/paper-plugins/ViaBackwards-5.0.1.jar rename to ansible/src/paper-plugins/ViaBackwards-5.0.3.jar index 4277db87a..02703b94f 100644 Binary files a/ansible/src/paper-plugins/ViaBackwards-5.0.1.jar and b/ansible/src/paper-plugins/ViaBackwards-5.0.3.jar differ diff --git a/ansible/src/paper-plugins/ViaVersion-5.0.1.jar b/ansible/src/paper-plugins/ViaVersion-5.0.3.jar similarity index 77% rename from ansible/src/paper-plugins/ViaVersion-5.0.1.jar rename to ansible/src/paper-plugins/ViaVersion-5.0.3.jar index cc823d027..5311d9072 100644 Binary files a/ansible/src/paper-plugins/ViaVersion-5.0.1.jar and b/ansible/src/paper-plugins/ViaVersion-5.0.3.jar differ diff --git a/ansible/templates/stacks/minecraft.yml.j2 b/ansible/templates/stacks/minecraft.yml.j2 index 96f4583fe..88e160219 100644 --- a/ansible/templates/stacks/minecraft.yml.j2 +++ b/ansible/templates/stacks/minecraft.yml.j2 @@ -90,6 +90,8 @@ services: CIV_RABBITMQ_USERNAME: rabbitmq CIV_RABBITMQ_PASSWORD: '{{secret.minecraft.rabbitmq.password}}' + WATCHDOG_TIMEOUT_TIME: 60 + volumes: # Persistence - /opt/stacks/minecraft/paper-data:/data @@ -114,7 +116,7 @@ services: - /opt/PrivateConfig/paper/config/EvenMoreFish/rarities.yml:/config/plugins/EvenMoreFish/rarities.yml - /opt/PrivateConfig/paper/config/EvenMoreFish/competitions.yml:/config/plugins/EvenMoreFish/competitions.yml - /opt/PrivateConfig/paper/config/RandomSpawn/worlds.yml:/config/plugins/RandomSpawn/worlds.yml - + deploy: placement: constraints: [node.role == manager] diff --git a/docker-compose.yml b/docker-compose.yml index 1dff04ed9..d09729a88 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -78,6 +78,11 @@ services: CIV_RABBITMQ_HOST: rabbitmq CIV_RABBITMQ_USERNAME: rabbitmq CIV_RABBITMQ_PASSWORD: rabbitmq + + JVM_OPTS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 + WATCHDOG_TIMEOUT_TIME: 6000 + ports: + - "5005:5005" volumes: - ./containers/data/paper:/data - ./ansible/files/paper-config:/config