From 4fd37054d9e6ec1a0c9552690bd19c04d4bfeaba Mon Sep 17 00:00:00 2001 From: walterhiggins Date: Thu, 25 Dec 2014 11:37:00 +0000 Subject: [PATCH] getting ready for working on 1.8 --- src/main/js/plugins/drone/blocktype.js | 15 +++------------ src/main/js/plugins/drone/drone.js | 3 +++ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/js/plugins/drone/blocktype.js b/src/main/js/plugins/drone/blocktype.js index 0067d55..1a2c21e 100644 --- a/src/main/js/plugins/drone/blocktype.js +++ b/src/main/js/plugins/drone/blocktype.js @@ -326,17 +326,7 @@ for ( c in bitmaps.raw ) { } } } - - -// -// message -// string with text to be displayed -// fg -// foreground material. The material the text will be in. -// bg -// background material, optional. The negative space within the bounding box of the text. -// -Drone.extend('blocktype', function( message, fg, bg ) { +function blocktype( message, fg, bg ) { var bmfg, bmbg, @@ -402,7 +392,8 @@ Drone.extend('blocktype', function( message, fg, bg ) { } return this.move( 'blocktext' ); -}); +} +Drone.extend(blocktype); diff --git a/src/main/js/plugins/drone/drone.js b/src/main/js/plugins/drone/drone.js index d48bdb7..552525c 100644 --- a/src/main/js/plugins/drone/drone.js +++ b/src/main/js/plugins/drone/drone.js @@ -578,6 +578,9 @@ function putBlock( x, y, z, blockId, metadata, world ) { var block = world.getBlockAt( x, y, z ); if ( block.typeId != blockId || block.data != metadata ) { if (__plugin.canary) { + if (block.getProperties){ + // TODO we are in 1.8 + } world.setBlockAt(x, y, z, blockId, metadata); return; }