pendulum
/
schat2-clive
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Compare commits

base: pendulum:56d8bd34be22c8c6fa88f6cbebf8d9fc1f772886
Branches Tags
pendulum:master
pendulum:socketio
..
compare: pendulum:cb023f0c2817d1f7d8b7621e0c499b953e6a13b9
Branches Tags
pendulum:master
pendulum:socketio

No commits in common. "56d8bd34be22c8c6fa88f6cbebf8d9fc1f772886" and "cb023f0c2817d1f7d8b7621e0c499b953e6a13b9" have entirely different histories.
56d8bd34be ... cb023f0c28

3 changed files with 7 additions and 7 deletions
Show Stats Expand all files Collapse all files

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "schat2-clive", "name": "schat2-clive",
"version": "1.5.15", "version": "1.5.14",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "schat2-clive", "name": "schat2-clive",
"version": "1.5.15", "version": "1.5.14",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"bhttp": "^1.2.8", "bhttp": "^1.2.8",

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "schat2-clive", "name": "schat2-clive",
"version": "1.5.15", "version": "1.5.14",
"description": "Game host for SChat 2-powered chat sites", "description": "Game host for SChat 2-powered chat sites",
"main": "src/app.js", "main": "src/app.js",
"scripts": { "scripts": {

8
src/games/mash.js
View File

@ -172,13 +172,13 @@ function onCommand(args, context) {
return; return;
} }
if (!word && mash) { if (!word && !mash) {
context.sendMessage(`The current mash is: **${mash.anagram}**`, context.room.id); context.sendMessage(`Start a mash with ${config.prefix}mash {length}`, context.room.id);
return; return;
} }
if (!word || !mash) { if (!word && mash) {
context.sendMessage(`Start a mash with ${config.prefix}mash {length}`, context.room.id); context.sendMessage(`The current mash is: **${mash.anagram}**`, context.room.id);
return; return;
} }