Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
bgon committed Mar 19, 2016
2 parents 867038d + e5eae21 commit 12b0d46
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 30 deletions.
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
scriptcraft-version=3.1.12
scriptcraft-version=3.2.0
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<!-- compiles against these libraries -->
<property name="lib.canary" location="lib/canarymod-1.8.0.jar"/>
<property name="lib.bukkit" location="lib/spigot-1.8.8.jar"/>
<property name="lib.bukkit" location="lib/spigot-1.9.jar"/>

<property name="build" location="target/classes"/>
<property name="dist" location="target/" />
Expand Down
97 changes: 70 additions & 27 deletions docs/API-Reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,6 @@ Walter Higgins
* [events.vehicleDamage()](#eventsvehicledamage-1)
* [events.vehicleUpdate()](#eventsvehicleupdate)
* [events.vehicleCreate()](#eventsvehiclecreate)
* [events.paintingBreak()](#eventspaintingbreak)
* [events.paintingBreakByEntity()](#eventspaintingbreakbyentity)
* [events.paintingPlace()](#eventspaintingplace)
* [events.enchantItem()](#eventsenchantitem)
* [events.prepareItemEnchant()](#eventsprepareitemenchant)
* [events.playerInteractEntity()](#eventsplayerinteractentity)
Expand Down Expand Up @@ -234,11 +231,13 @@ Walter Higgins
* [events.playerVelocity()](#eventsplayervelocity)
* [events.playerQuit()](#eventsplayerquit)
* [events.playerLogin()](#eventsplayerlogin)
* [events.playerSwapHandItems()](#eventsplayerswaphanditems)
* [events.playerKick()](#eventsplayerkick)
* [events.playerToggleSprint()](#eventsplayertogglesprint)
* [events.playerCommandPreprocess()](#eventsplayercommandpreprocess)
* [events.playerGameModeChange()](#eventsplayergamemodechange)
* [events.furnaceSmelt()](#eventsfurnacesmelt)
* [events.prepareAnvil()](#eventsprepareanvil)
* [events.inventoryDrag()](#eventsinventorydrag)
* [events.craftItem()](#eventscraftitem)
* [events.furnaceBurn()](#eventsfurnaceburn)
Expand All @@ -260,6 +259,7 @@ Walter Higgins
* [events.mapInitialize()](#eventsmapinitialize)
* [events.serviceUnregister()](#eventsserviceunregister)
* [events.pluginEnable()](#eventspluginenable-1)
* [events.villagerAcquireTrade()](#eventsvillageracquiretrade)
* [events.playerDeath()](#eventsplayerdeath-1)
* [events.entityCreatePortal()](#eventsentitycreateportal)
* [events.entityCombust()](#eventsentitycombust)
Expand All @@ -272,6 +272,7 @@ Walter Higgins
* [events.projectileHit()](#eventsprojectilehit-1)
* [events.foodLevelChange()](#eventsfoodlevelchange)
* [events.itemDespawn()](#eventsitemdespawn)
* [events.villagerReplenishTrade()](#eventsvillagerreplenishtrade)
* [events.entityPortalEnter()](#eventsentityportalenter)
* [events.entityPortal()](#eventsentityportal)
* [events.entityTarget()](#eventsentitytarget)
Expand All @@ -286,6 +287,7 @@ Walter Higgins
* [events.entityUnleash()](#eventsentityunleash)
* [events.entityExplode()](#eventsentityexplode)
* [events.entityInteract()](#eventsentityinteract)
* [events.entityToggleGlide()](#eventsentitytoggleglide)
* [events.explosionPrime()](#eventsexplosionprime)
* [events.horseJump()](#eventshorsejump)
* [events.creatureSpawn()](#eventscreaturespawn)
Expand All @@ -298,6 +300,7 @@ Walter Higgins
* [events.itemMerge()](#eventsitemmerge)
* [events.slimeSplit()](#eventsslimesplit-1)
* [events.pigZap()](#eventspigzap)
* [events.fireworkExplode()](#eventsfireworkexplode-1)
* [events.potionSplash()](#eventspotionsplash)
* [events.entityChangeBlock()](#eventsentitychangeblock)
* [events.entityPortalExit()](#eventsentityportalexit)
Expand All @@ -307,6 +310,7 @@ Walter Higgins
* [events.blockMultiPlace()](#eventsblockmultiplace)
* [events.blockExplode()](#eventsblockexplode)
* [events.notePlay()](#eventsnoteplay)
* [events.cauldronLevelChange()](#eventscauldronlevelchange)
* [events.blockFade()](#eventsblockfade)
* [events.blockPlace()](#eventsblockplace-1)
* [events.blockPhysics()](#eventsblockphysics-1)
Expand Down Expand Up @@ -2143,30 +2147,6 @@ The crucial difference is that the events module now has functions for each of t

* priority - optional - see events.on() for more information.

### events.paintingBreak()

#### Parameters

* callback - A function which is called whenever the [painting.PaintingBreakEvent event](https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/painting/PaintingBreakEvent.html) is fired

* priority - optional - see events.on() for more information.

### events.paintingBreakByEntity()

#### Parameters

* callback - A function which is called whenever the [painting.PaintingBreakByEntityEvent event](https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/painting/PaintingBreakByEntityEvent.html) is fired

* priority - optional - see events.on() for more information.

### events.paintingPlace()

#### Parameters

* callback - A function which is called whenever the [painting.PaintingPlaceEvent event](https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/painting/PaintingPlaceEvent.html) is fired

* priority - optional - see events.on() for more information.

### events.enchantItem()

#### Parameters
Expand Down Expand Up @@ -2535,6 +2515,14 @@ The crucial difference is that the events module now has functions for each of t

* priority - optional - see events.on() for more information.

### events.playerSwapHandItems()

#### Parameters

* callback - A function which is called whenever the [player.PlayerSwapHandItemsEvent event](https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/player/PlayerSwapHandItemsEvent.html) is fired

* priority - optional - see events.on() for more information.

### events.playerKick()

#### Parameters
Expand Down Expand Up @@ -2575,6 +2563,14 @@ The crucial difference is that the events module now has functions for each of t

* priority - optional - see events.on() for more information.

### events.prepareAnvil()

#### Parameters

* callback - A function which is called whenever the [inventory.PrepareAnvilEvent event](https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/inventory/PrepareAnvilEvent.html) is fired

* priority - optional - see events.on() for more information.

### events.inventoryDrag()

#### Parameters
Expand Down Expand Up @@ -2743,6 +2739,14 @@ The crucial difference is that the events module now has functions for each of t

* priority - optional - see events.on() for more information.

### events.villagerAcquireTrade()

#### Parameters

* callback - A function which is called whenever the [entity.VillagerAcquireTradeEvent event](https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/entity/VillagerAcquireTradeEvent.html) is fired

* priority - optional - see events.on() for more information.

### events.playerDeath()

#### Parameters
Expand Down Expand Up @@ -2839,6 +2843,14 @@ The crucial difference is that the events module now has functions for each of t

* priority - optional - see events.on() for more information.

### events.villagerReplenishTrade()

#### Parameters

* callback - A function which is called whenever the [entity.VillagerReplenishTradeEvent event](https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/entity/VillagerReplenishTradeEvent.html) is fired

* priority - optional - see events.on() for more information.

### events.entityPortalEnter()

#### Parameters
Expand Down Expand Up @@ -2951,6 +2963,14 @@ The crucial difference is that the events module now has functions for each of t

* priority - optional - see events.on() for more information.

### events.entityToggleGlide()

#### Parameters

* callback - A function which is called whenever the [entity.EntityToggleGlideEvent event](https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/entity/EntityToggleGlideEvent.html) is fired

* priority - optional - see events.on() for more information.

### events.explosionPrime()

#### Parameters
Expand Down Expand Up @@ -3047,6 +3067,14 @@ The crucial difference is that the events module now has functions for each of t

* priority - optional - see events.on() for more information.

### events.fireworkExplode()

#### Parameters

* callback - A function which is called whenever the [entity.FireworkExplodeEvent event](https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/entity/FireworkExplodeEvent.html) is fired

* priority - optional - see events.on() for more information.

### events.potionSplash()

#### Parameters
Expand Down Expand Up @@ -3119,6 +3147,14 @@ The crucial difference is that the events module now has functions for each of t

* priority - optional - see events.on() for more information.

### events.cauldronLevelChange()

#### Parameters

* callback - A function which is called whenever the [block.CauldronLevelChangeEvent event](https://hub.spigotmc.org/javadocs/spigot/org/bukkit/event/block/CauldronLevelChangeEvent.html) is fired

* priority - optional - see events.on() for more information.

### events.blockFade()

#### Parameters
Expand Down Expand Up @@ -6751,6 +6787,7 @@ The Entities module provides a suite of functions - one for each possible entity
The following functions are provided:
* area_effect_cloud()
* armor_stand()
* arrow()
* bat()
Expand All @@ -6761,6 +6798,7 @@ The following functions are provided:
* complex_part()
* cow()
* creeper()
* dragon_fireball()
* dropped_item()
* egg()
* ender_crystal()
Expand All @@ -6782,6 +6820,7 @@ The following functions are provided:
* item_frame()
* leash_hitch()
* lightning()
* lingering_potion()
* magma_cube()
* minecart()
* minecart_chest()
Expand All @@ -6799,16 +6838,20 @@ The following functions are provided:
* primed_tnt()
* rabbit()
* sheep()
* shulker()
* shulker_bullet()
* silverfish()
* skeleton()
* slime()
* small_fireball()
* snowball()
* snowman()
* spectral_arrow()
* spider()
* splash_potion()
* squid()
* thrown_exp_bottle()
* tipped_arrow()
* unknown()
* villager()
* weather()
Expand Down
Binary file renamed lib/spigot-1.8.8.jar → lib/spigot-1.9.jar
Binary file not shown.
7 changes: 7 additions & 0 deletions release-notes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
RELEASE NOTES
=============
3.2.0 Release (2016 03 20)
--------------------------

Bug fixes and updated from Spigot 1.8.8 to Spigot 1.9

Fixed issues #256 and #287

3.1.12 Release (2015 12 30)
---------------------------

Expand Down
2 changes: 1 addition & 1 deletion src/main/js/lib/events-bukkit.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ exports.on = function(
The workaround is to make the ScriptCraftPlugin java class a Listener.
Should only unregister() registered plugins in ScriptCraft js code.
*/
regd = new bkRegisteredListener( __plugin, eventExecutor, priority, __plugin, true );
regd = new bkRegisteredListener( __plugin, eventExecutor, priority, __plugin, false );
handlerList.register( regd );
result.unregister = function(){
handlerList.unregister( regd );
Expand Down

0 comments on commit 12b0d46

Please sign in to comment.