diff options
| author | Logan Fick <logaldeveloper@protonmail.com> | 2017-10-29 19:44:52 -0400 |
|---|---|---|
| committer | Logan Fick <logaldeveloper@protonmail.com> | 2017-10-29 19:44:52 -0400 |
| commit | 2d9fdcd802b32dd17168a9317977fc7dfa30257b (patch) | |
| tree | 14fbbf48001c6e02ff2a4f03cdeba0b34527ccb2 | |
| parent | 7d766c8cf2043e386346a3b479875400f1f1464c (diff) | |
Added backward compatibility for old data format.
| -rw-r--r-- | app/controllers/statics_controller.rb | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/app/controllers/statics_controller.rb b/app/controllers/statics_controller.rb index a47b893..0809dbc 100644 --- a/app/controllers/statics_controller.rb +++ b/app/controllers/statics_controller.rb @@ -20,15 +20,23 @@ class StaticsController < ApplicationController @players = [] @count = 0 begin - json = JSON.parse(File.read("/etc/minecraft/redstoner/plugins/ModuleLoader/players.json"))["players"].reject{|p| !mod? && p["vanished"] == "true"} + json = JSON.parse(File.read("/etc/minecraft/redstoner/plugins/ModuleLoader/players.json")) rescue flash.now[:alert] = "The server is currently offline." else - json.each do |p| - @players.push(User.find_by(uuid: p["UUID"].tr("-", "")) || User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true)) + case json["dataFormat"] + when "v1" + @players = json["players"].collect!{ |p| User.find_by(uuid: p["UUID"].tr("-", "")) or User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true) } + @count = json["amount"] + when "v2" + json["players"].reject{|p| !mod? && p["vanished"] == "true"}.each do |p| + @players.push(User.find_by(uuid: p["UUID"].tr("-", "")) || User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true)) + end + @count = @players.count + else + flash.now[:alert] = "The server is using an incompatible data format. Please report this error!" end + @players.sort_by!(&:role).reverse! end - @players.sort_by!(&:role).reverse! - @count = @players.count end end |