Skip to content

Commit

Permalink
Merge pull request #1 from walterhiggins/master
Browse files Browse the repository at this point in the history
Pull in latest updates from core
  • Loading branch information
TonyGravagno committed Dec 9, 2016
2 parents bc2ab29 + 0aebd5f commit e6c95ec
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ Developer Chris Cacciatore has created some interesting tools using ScriptCraft:

# 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

Expand Down
1 change: 1 addition & 0 deletions docs/YoungPersonsGuideToProgrammingMinecraft.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
* [Counting block break events for each player](#counting-block-break-events-for-each-player)
* [Next Steps](#next-steps)

## Introduction

Minecraft is an open-ended 3D game where you can build and craft
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/modules/http/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The following example illustrates how to use http.request to make a request to a
```javascript
var jsResponse;
var http = require('request');
var http = require('http');
http.request('http://scriptcraftjs.org/sample.json',function(responseCode, responseBody){
jsResponse = JSON.parse( responseBody );
});
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/modules/minigames/scoreboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function updatePlayerScore( objectiveName, playerName, score ){
var sc = sb['getScore(String, ScoreObjective)']( playerName, sb.getScoreObjective( objectiveName) );
sc.score = score;
*/
execCommand('scoreboard players set ' + playerName + ' ' + objectiveName + score);
execCommand('scoreboard players set ' + playerName + ' ' + objectiveName + ' ' + score);
}

function removeTeamFromScoreboard( teamName ){
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/plugins/entities.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
/*global reuire, exports*/
/*global require, exports*/
/*
make entities a global variable for use at in-game prompt
Tab completion is a useful way to discover what entity types are available.
Expand Down

0 comments on commit e6c95ec

Please sign in to comment.