Fixed bug in rainbow (wasn't drawing) and switched to using Bukkit Scheduler API for dancefloor drone function.
This commit is contained in:
parent
eaea34e172
commit
3f2bc8c80b
2 changed files with 11 additions and 12 deletions
|
@ -13,7 +13,7 @@ Drone.extend('dancefloor',function(width,length)
|
||||||
//
|
//
|
||||||
// create a separate Drone object to lay down disco tiles
|
// create a separate Drone object to lay down disco tiles
|
||||||
//
|
//
|
||||||
var disco = new Drone(this.x,this.y, this.z, this.dir);
|
var disco = new Drone(this.x, this.y, this.z, this.dir, this.world);
|
||||||
//
|
//
|
||||||
// under-floor lighting
|
// under-floor lighting
|
||||||
//
|
//
|
||||||
|
@ -23,15 +23,14 @@ Drone.extend('dancefloor',function(width,length)
|
||||||
// strobe gets called in a java thread - disco only lasts 30 seconds.
|
// strobe gets called in a java thread - disco only lasts 30 seconds.
|
||||||
//
|
//
|
||||||
var discoTicks = 30;
|
var discoTicks = 30;
|
||||||
var strobe = function()
|
var task = null;
|
||||||
{
|
var strobe = function() {
|
||||||
while(discoTicks--)
|
|
||||||
{
|
|
||||||
disco.rand(floorTiles,width,1,length);
|
disco.rand(floorTiles,width,1,length);
|
||||||
java.lang.Thread.sleep(1000);
|
if (!discoTicks--)
|
||||||
}
|
task.cancel();
|
||||||
};
|
};
|
||||||
var thread = new java.lang.Thread(strobe);
|
var now = 0;
|
||||||
thread.start();
|
var everySecond = 20;
|
||||||
|
task = server.scheduler.runTaskTimer(__plugin,strobe,now,everySecond);
|
||||||
return this;
|
return this;
|
||||||
});
|
});
|
||||||
|
|
|
@ -24,8 +24,8 @@ Drone.extend('rainbow', function(radius){
|
||||||
this.chkpt('rainbow');
|
this.chkpt('rainbow');
|
||||||
this.down(radius);
|
this.down(radius);
|
||||||
// copy blocks.rainbow and add air at end (to compensate for strokewidth)
|
// copy blocks.rainbow and add air at end (to compensate for strokewidth)
|
||||||
var colors = blocks.rainbow.slice(0).push(blocks.air);
|
var colors = blocks.rainbow.slice(0);
|
||||||
|
colors.push(blocks.air);
|
||||||
for (var i = 0;i < colors.length; i++) {
|
for (var i = 0;i < colors.length; i++) {
|
||||||
var bm = this._getBlockIdAndMeta(colors[i]);
|
var bm = this._getBlockIdAndMeta(colors[i]);
|
||||||
this.arc({
|
this.arc({
|
||||||
|
|
Reference in a new issue