arg/scriptcraft
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into development

Browse source
This commit is contained in:
BuildTools 2016-12-20 17:36:07 +00:00
parent f60c8ef96d 0aebd5fa95
commit 7701c6783c
5 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -241,7 +241,7 @@ Developer Chris Cacciatore has created some interesting tools using ScriptCraft:
# Docker # Docker
To launch a container with CanaryMod and ScriptCraft you can just do To launch a container with SpigotMC and ScriptCraft you can just do
docker run -p 25565:25565 -it tclavier/scriptcraft docker run -p 25565:25565 -it tclavier/scriptcraft

1
docs/YoungPersonsGuideToProgrammingMinecraft.md
View file

@ -43,6 +43,7 @@ If you would like to make changes, change file src/docs/templates/ypgpm.md inste
* [Keeping Score - Lookup tables in Javascript](#keeping-score---lookup-tables-in-javascript) * [Keeping Score - Lookup tables in Javascript](#keeping-score---lookup-tables-in-javascript)
* [Counting block break events for each player](#counting-block-break-events-for-each-player) * [Counting block break events for each player](#counting-block-break-events-for-each-player)
* [Next Steps](#next-steps) * [Next Steps](#next-steps)
## Introduction ## Introduction
Minecraft is an open-ended 3D game where you can build and craft Minecraft is an open-ended 3D game where you can build and craft

2
src/main/js/modules/http/request.js
View file

@ -30,7 +30,7 @@ The following example illustrates how to use http.request to make a request to a
```javascript ```javascript
var jsResponse; var jsResponse;
var http = require('request'); var http = require('http');
http.request('http://scriptcraftjs.org/sample.json',function(responseCode, responseBody){ http.request('http://scriptcraftjs.org/sample.json',function(responseCode, responseBody){
jsResponse = JSON.parse( responseBody ); jsResponse = JSON.parse( responseBody );
}); });

2
src/main/js/modules/minigames/scoreboard.js
View file

@ -55,7 +55,7 @@ function updatePlayerScore( objectiveName, playerName, score ){
var sc = sb['getScore(String, ScoreObjective)']( playerName, sb.getScoreObjective( objectiveName) ); var sc = sb['getScore(String, ScoreObjective)']( playerName, sb.getScoreObjective( objectiveName) );
sc.score = score; sc.score = score;
*/ */
execCommand('scoreboard players set ' + playerName + ' ' + objectiveName + score); execCommand('scoreboard players set ' + playerName + ' ' + objectiveName + ' ' + score);
} }
function removeTeamFromScoreboard( teamName ){ function removeTeamFromScoreboard( teamName ){

2
src/main/js/plugins/entities.js
View file

@ -1,5 +1,5 @@
'use strict'; 'use strict';
/*global reuire, exports*/ /*global require, exports*/
/* /*
make entities a global variable for use at in-game prompt make entities a global variable for use at in-game prompt
Tab completion is a useful way to discover what entity types are available. Tab completion is a useful way to discover what entity types are available.