Projects >> Denizen-For-Bukkit >>0dfaaeb9d16e5d4366625f3cb6a3dd00034cbfd0

Chunk
Conflicting content
    // <--[event]
    // @Events
<<<<<<< HEAD
=======
    // player fills bucket
    //
    // @Triggers when a player fills a bucket.
    // @Context
    //  returns the dItem of the bucket.
    //  returns the dLocation of the block clicked with the bucket.
    //
    // @Determine
    // "CANCELLED" to stop the player from filling the bucket.
    // dItem to set the item in the player's hand after the event.
    //
    // -->
    @EventHandler
    public void playerBucketFill(PlayerBucketFillEvent event) {

        Map context = new HashMap();
        context.put("item", new dItem(event.getBucket()));
        context.put("location", new dLocation(event.getBlockClicked().getLocation()));

        String determination = doEvents(Arrays.asList
                ("player fills bucket"),
                null, dEntity.getPlayerFrom(event.getPlayer()), context);

        // Handle message
        if (determination.toUpperCase().startsWith("CANCELLED"))
            event.setCancelled(true);
        if (dItem.matches(determination)) {
            ItemStack is = dItem.valueOf(determination).getItemStack();
            event.setItemStack( is != null ? is : new ItemStack(Material.AIR));
        }
    }

    // <--[event]
    // @Events
>>>>>>> d38a1abd622587102d652bd8c05aed0c28953c48
    // player changes world
    // player changes world from 
    // player changes world to 
Solution content
    // <--[event]
    // @Events
<<<<<<< HEAD
=======
    // player fills bucket
    //
    // @Triggers when a player fills a bucket.
    // @Context
    //  returns the dItem of the bucket.
    //  returns the dLocation of the block clicked with the bucket.
    //
    // @Determine
    // "CANCELLED" to stop the player from filling the bucket.
    // dItem to set the item in the player's hand after the event.
    //
    // -->
    @EventHandler
    public void playerBucketFill(PlayerBucketFillEvent event) {

        Map context = new HashMap();
        context.put("item", new dItem(event.getBucket()));
        context.put("location", new dLocation(event.getBlockClicked().getLocation()));

        String determination = doEvents(Arrays.asList
                ("player fills bucket"),
                null, dEntity.getPlayerFrom(event.getPlayer()), context);

        // Handle message
        if (determination.toUpperCase().startsWith("CANCELLED"))
            event.setCancelled(true);
        if (dItem.matches(determination)) {
            ItemStack is = dItem.valueOf(determination).getItemStack();
            event.setItemStack( is != null ? is : new ItemStack(Material.AIR));
        }
    }

    // <--[event]
    // @Events
>>>>>>> d38a1abd622587102d652bd8c05aed0c28953c48
    // player changes world
    // player changes world from 
    // player changes world to 
File
BukkitWorldScriptHelper.java
Developer's decision
Manual
Kind of conflict
Annotation
Comment
Method declaration