forked from kaboomserver/server
fix merge conflict
This commit is contained in:
parent
247d47f46c
commit
6d01c49809
1 changed files with 0 additions and 11 deletions
|
@ -93,17 +93,6 @@ packet-limiter:
|
|||
action: DROP
|
||||
interval: 4.0
|
||||
max-packet-rate: 5.0
|
||||
<<<<<<< HEAD
|
||||
# ServerboundSetCommandBlockPacket:
|
||||
# action: DROP
|
||||
# interval: 1.0
|
||||
# max-packet-rate: 101.0
|
||||
ServerboundSetCommandMinecartPacket:
|
||||
action: DROP
|
||||
interval: 1.0
|
||||
max-packet-rate: 101.0
|
||||
=======
|
||||
>>>>>>> ac44954b6b90d8247c396b56c9bf0f075a432b78
|
||||
ServerboundSetJigsawBlockPacket:
|
||||
action: DROP
|
||||
interval: 1.0
|
||||
|
|
Loading…
Reference in a new issue