Commit Graph

2 Commits

Author SHA1 Message Date
Shane Freeder
836db0ec9c
Update CB, refactor 0229-Fix-this-stupid-bullshit
Refactored 0229-Fix-this-stupid-bullshit in order to prevent merge conflicts
when spigot decides to update the timer and to provide some form of hint in the
console/log on startup.
2017-09-15 15:37:05 +01:00
Aikar
ff5bd7b03b Upstream update 2017-08-07 23:05:16 -04:00