Compare commits

..

No commits in common. "develop" and "1.0.0" have entirely different histories.

11 changed files with 38 additions and 54 deletions

View File

@ -9,25 +9,23 @@ ADD ./src ${CONFIG_PATH}
RUN mkdir ${DATA_PATH} RUN mkdir ${DATA_PATH}
# Add symlinks to Minecraft Vanilla files # Add symlinks to Default Minecraft files
RUN mkdir ${DATA_PATH}/Vanilla && \ RUN touch ${DATA_PATH}/banned-ips.json && \
touch ${DATA_PATH}/Vanilla/banned-ips.json && \ ln -sf ${DATA_PATH}/banned-ips.json ${CONFIG_PATH}
ln -sf ${DATA_PATH}/Vanilla/banned-ips.json ${CONFIG_PATH} && \ RUN touch ${DATA_PATH}/banned-players.json && \
touch ${DATA_PATH}/Vanilla/banned-players.json && \ ln -sf ${DATA_PATH}/banned-players.json ${CONFIG_PATH}
ln -sf ${DATA_PATH}/Vanilla/banned-players.json ${CONFIG_PATH} && \ RUN mkdir ${DATA_PATH}/logs && \
mkdir ${DATA_PATH}/Vanilla/logs && \ ln -sf ${DATA_PATH}/logs ${CONFIG_PATH}
ln -sf ${DATA_PATH}/Vanilla/logs ${CONFIG_PATH} && \ RUN touch ${DATA_PATH}/ops.json && \
touch ${DATA_PATH}/Vanilla/ops.json && \ ln -sf ${DATA_PATH}/ops.json ${CONFIG_PATH}
ln -sf ${DATA_PATH}/Vanilla/ops.json ${CONFIG_PATH} && \ RUN touch ${DATA_PATH}/usercache.json && \
touch ${DATA_PATH}/Vanilla/usercache.json && \ ln -sf ${DATA_PATH}/usercache.json ${CONFIG_PATH}
ln -sf ${DATA_PATH}/Vanilla/usercache.json ${CONFIG_PATH} && \ RUN touch ${DATA_PATH}/whitelist.json && \
touch ${DATA_PATH}/Vanilla/whitelist.json && \ ln -sf ${DATA_PATH}/whitelist.json ${CONFIG_PATH}
ln -sf ${DATA_PATH}/Vanilla/whitelist.json ${CONFIG_PATH}
# Add symlinks to PlasmoVoice files # Add symlinks to Plasmo Voice files
RUN mkdir ${DATA_PATH}/PlasmoVoice && \ RUN touch ${DATA_PATH}/pv-voice_mutes.json && \
touch ${DATA_PATH}/PlasmoVoice/pv-voice_mutes.json && \ ln -sf ${DATA_PATH}/pv-voice_mutes.json \
ln -sf ${DATA_PATH}/PlasmoVoice/pv-voice_mutes.json \
${CONFIG_PATH}/plugins/PlasmoVoice/voice_mutes.json ${CONFIG_PATH}/plugins/PlasmoVoice/voice_mutes.json
# Add symlinks to SuperVanish files # Add symlinks to SuperVanish files
@ -94,17 +92,6 @@ ENV SKINSRESTORER_DB_PASSWORD=0000
WORKDIR ${WORKDIR_PATH}/config WORKDIR ${WORKDIR_PATH}/config
CMD \ 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 && \
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. # Create and switch to user with desired UID and GID.
# All processes that create/change files in ${DATA_PATH} # All processes that create/change files in ${DATA_PATH}
# must be run under this user. # must be run under this user.

View File

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

View File

@ -4,9 +4,9 @@ holograms:
type: TEXT type: TEXT
location: location:
world: world world: world
x: 512255.5 x: 255.5
y: 3.057499885559082 y: 3.057499885559082
z: 512262.5 z: 262.5
yaw: -180.0 yaw: -180.0
pitch: 0.0 pitch: 0.0
visibility_distance: -1 visibility_distance: -1
@ -35,9 +35,9 @@ holograms:
type: TEXT type: TEXT
location: location:
world: world world: world
x: 512261.5 x: 261.5
y: 2.25 y: 2.25
z: 512261.5 z: 261.5
yaw: 135.0 yaw: 135.0
pitch: 0.0 pitch: 0.0
visibility_distance: 32 visibility_distance: 32
@ -63,9 +63,9 @@ holograms:
type: TEXT type: TEXT
location: location:
world: world world: world
x: 512249.5 x: 249.5
y: 2.25 y: 2.25
z: 512261.5 z: 261.5
yaw: -135.0 yaw: -135.0
pitch: 0.0 pitch: 0.0
visibility_distance: 32 visibility_distance: 32

View File

@ -6,9 +6,9 @@ npcs:
type: PLAYER type: PLAYER
location: location:
world: world world: world
x: 512255.5 x: 255.5
y: 0.9375 y: 0.9375
z: 512262.5 z: 262.5
yaw: -180.0 yaw: -180.0
pitch: 0.0 pitch: 0.0
showInTab: false showInTab: false
@ -43,9 +43,9 @@ npcs:
type: INTERACTION type: INTERACTION
location: location:
world: world world: world
x: 512261.5 x: 261.5
y: 2.0 y: 2.0
z: 512261.5 z: 261.5
yaw: -35.550262 yaw: -35.550262
pitch: 11.700032 pitch: 11.700032
showInTab: false showInTab: false
@ -78,9 +78,9 @@ npcs:
type: INTERACTION type: INTERACTION
location: location:
world: world world: world
x: 512249.5 x: 249.5
y: 2.0 y: 2.0
z: 512261.5 z: 261.5
yaw: -121.19934 yaw: -121.19934
pitch: 76.49999 pitch: 76.49999
showInTab: false showInTab: false

View File

@ -1,7 +1,7 @@
spawn: spawn:
world: world world: world
x: 512255.5 x: 255.5
y: 1.0 y: 1.0
z: 512258.5 z: 258.5
yaw: 0.0 yaw: 0.0
pitch: 0.0 pitch: 0.0

View File

@ -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) # What is the maximum per second a client can send (Use %pps to display their pps)
# Use -1 to disable. # Use -1 to disable.
max-pps: -1 max-pps: 800
max-pps-kick-msg: You are sending too many packets! 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. # We can also kick them if over a period they send over a threshold a certain amount of times.

View File

@ -11,8 +11,8 @@
# #
regions: regions:
spawn: spawn:
min: {x: 512206, y: 0, z: 512206} min: {x: 206, y: 0, z: 206}
max: {x: 512304, y: 32, z: 512304} max: {x: 304, y: 32, z: 304}
members: {} members: {}
flags: {other-explosion: deny, lava-fire: deny, water-flow: deny, use: deny, flags: {other-explosion: deny, lava-fire: deny, water-flow: deny, use: deny,
invincible: allow, snow-fall: deny, leaf-decay: deny, firework-damage: deny, invincible: allow, snow-fall: deny, leaf-decay: deny, firework-damage: deny,

Binary file not shown.

BIN
src/world/poi/r.1000.1000.mca (Stored with Git LFS)

Binary file not shown.

BIN
src/world/region/r.0.0.mca (Stored with Git LFS) Normal file

Binary file not shown.

BIN
src/world/region/r.1000.1000.mca (Stored with Git LFS)

Binary file not shown.