Skip to content

Commit 62ff903

Browse files
committed
Fix issue #261
1 parent 78ddb5f commit 62ff903

File tree

4 files changed

+21
-3
lines changed

4 files changed

+21
-3
lines changed

build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
scriptcraft-version=3.1.8
1+
scriptcraft-version=3.1.9

build.xml

+8
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@
5757

5858

5959
<target name="get-canary" depends="init" description="Downloads canarymod jar" unless="canary.present">
60+
<mkdir dir="target/lib/"/>
61+
<get src="http://scriptcraftjs.org/download/latest/CanaryMod-1.8.0-1.2.1-SNAPSHOT-shaded.jar"
62+
maxtime="60"
63+
dest="target/lib/canarymod.jar"
64+
verbose="true"/>
65+
<!--
66+
wph 20150801 - CanaryMod is no longer being developed. Get the latest version from scriptcraftjs.org instead.
6067
<get src="https://ci.visualillusionsent.net/job/CanaryMod/lastStableBuild/artifact/*zip*/archive.zip"
6168
maxtime="60"
6269
dest="target/canarymod.zip"
@@ -65,6 +72,7 @@
6572
dest="target/lib">
6673
<mapper type="glob" from="*.jar" to="canarymod.jar"/>
6774
</unzip>
75+
-->
6876
</target>
6977

7078
<target name="compile-plugins" depends="init,get-canary" description="compile canary plugin source">

release-notes.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
RELEASE NOTES
22
=============
3+
3.1.9 Release (2015 08 01)
4+
--------------------------
5+
Bug fix: minigames/scoreboard.js module's updatePlayerScore() function did not work with latest version of CanaryMod.
6+
Using /scoreboard command instead. See https://github.com/walterhiggins/ScriptCraft/issues/261
7+
38
3.1.8 Release (2015 06 07)
49
--------------------------
510
Bug fix: Fixes drone on Spigot 1.8.7 with JDK 7 see

src/main/js/modules/minigames/scoreboard.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,13 @@ function addPlayerToTeam( objectiveName, teamName, playerName ){
4949
}
5050

5151
function updatePlayerScore( objectiveName, playerName, score ){
52-
var sc = sb['getScore(String, ScoreObjective)']( playerName, sb.getScoreObjective( objectiveName) );
53-
sc.score = score;
52+
/*
53+
wph 20150801 - this fails with CanaryMod 1.8.2 so use command instead - messy for ops but non-ops won't see messages
54+
55+
var sc = sb['getScore(String, ScoreObjective)']( playerName, sb.getScoreObjective( objectiveName) );
56+
sc.score = score;
57+
*/
58+
execCommand('scoreboard players set ' + playerName + ' ' + objectiveName + score);
5459
}
5560

5661
function removeTeamFromScoreboard( teamName ){

0 commit comments

Comments
 (0)