Skip to content

Updated to enable persist of the snowball-arenas object. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ekellener wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Updated to enable persist of the snowball-arenas object. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b850422
Added exported method for accessing persist() object
ekellener Jul 12, 2016
ecd75f9
Update command.js
ekellener Jul 12, 2016
af05e17
Update arena.js
ekellener Jul 12, 2016
cab56ab
Update command.js
ekellener Jul 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions chapter-19/arena.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ var instructions = [
'/jsp snowball'
];

// Added reference to prevent persist() object thrashing when called externally
function getArenas() {
return arenas;

function snowballArena() {
var arena = {};

Expand Down Expand Up @@ -67,4 +71,5 @@ function snowballArena() {

Drone.extend( snowballArena );

exports.getArenas = getArenas;

5 changes: 4 additions & 1 deletion chapter-19/command.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var utils = require('utils');
var cm = Packages.net.canarymod;
var cmLocation = cm.api.world.position.Location;
var game = require('./game');
var arenas = persist('snowball-arenas', []);


function snowball( params, sender ){
var duration = 60; // seconds
Expand All @@ -17,6 +17,9 @@ function snowball( params, sender ){
var teams = {red: [], blue:[], yellow:[]};
var spawns = [];
var spawn = null;
// use local arenas object reference from arenas.js, rather than creating another global one. Seemed to cause issues when it was global.
var aplugin = require('./arena');
var arenas = aplugin.getArenas();

for ( i = 0; i < arenas.length; i++ ) {
arena = arenas[i];
Expand Down