Projects >> WorldGuard >>428a47f889c881fca67e817baf537c6b2c6975ec

Chunk
Conflicting content 
        pm.registerEvent(Event.Type.ENTITY_EXPLODE, this, Priority.High, plugin);
        pm.registerEvent(Event.Type.CREATURE_SPAWN, this, Priority.High, plugin);
        pm.registerEvent(Event.Type.ENTITY_INTERACT, this, Priority.High, plugin);
<<<<<<< HEAD
=======
        pm.registerEvent(Event.Type.CREEPER_POWER, this, Priority.High, plugin);
        pm.registerEvent(Event.Type.PIG_ZAP, this, Priority.High, plugin);
>>>>>>> 19d447d67d0c4620368069a00c20812325916b2e
    }

    @Override
Solution content 
        pm.registerEvent(Event.Type.ENTITY_EXPLODE, this, Priority.High, plugin);
        pm.registerEvent(Event.Type.CREATURE_SPAWN, this, Priority.High, plugin);
        pm.registerEvent(Event.Type.ENTITY_INTERACT, this, Priority.High, plugin);
        pm.registerEvent(Event.Type.CREEPER_POWER, this, Priority.High, plugin);
        pm.registerEvent(Event.Type.PIG_ZAP, this, Priority.High, plugin);
    }

    @Override
File
WorldGuardEntityListener.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    /**
     * Called when a player left clicks air.
     *
     * @param event
     */
    public void handleAirLeftClick(PlayerInteractEvent event) {
         //I don't think we have to do anything here yet.
         return;
    }

    /**
     * Called when a player left clicks a block.
     *
     * @param event
     */
    public void handleBlockLeftClick(PlayerInteractEvent event) {
        if (event.isCancelled()) return;

        Player player = event.getPlayer();
        Block block = event.getClickedBlock();
        Material type = block.getType();
        World world = player.getWorld();

        ConfigurationManager cfg = plugin.getGlobalConfiguration();
        WorldConfiguration wcfg = cfg.get(world);
        if (wcfg.useRegions) {
            Vector pt = toVector(block);
            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
            LocalPlayer localPlayer = plugin.wrapPlayer(player);

            if (type == Material.STONE_BUTTON
                  || type == Material.LEVER
                  || type == Material.WOODEN_DOOR
                  || type == Material.NOTE_BLOCK) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.allows(DefaultFlag.USE)
                        && !set.canBuild(localPlayer)) {
                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to use that in this area.");
                    event.setCancelled(true);
                    return;
                }
            }
        }
    }

    /**
=======
    /**
     * Called when a player left clicks air.
     *
     * @param event
     */
    public void handleAirLeftClick(PlayerInteractEvent event) {
         //I don't think we have to do anything here yet.
         return;
    }

    /**
     * Called when a player left clicks a block.
     *
     * @param event
     */
    public void handleBlockLeftClick(PlayerInteractEvent event) {
        if (event.isCancelled()) return;

        Player player = event.getPlayer();
        Block block = event.getClickedBlock();
        Material type = block.getType();
        World world = player.getWorld();

        ConfigurationManager cfg = plugin.getGlobalConfiguration();
        WorldConfiguration wcfg = cfg.get(world);

        if (wcfg.useRegions) {
            Vector pt = toVector(block);
            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
            LocalPlayer localPlayer = plugin.wrapPlayer(player);

            if (type == Material.STONE_BUTTON
                  || type == Material.LEVER
                  || type == Material.WOODEN_DOOR
                  || type == Material.NOTE_BLOCK) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.allows(DefaultFlag.USE)
                        && !set.canBuild(localPlayer)) {
                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to use that in this area.");
                    event.setCancelled(true);
                    return;
                }
            }
        }
    }

    /**
>>>>>>> 19d447d67d0c4620368069a00c20812325916b2e
     * Called when a player right clicks air.
     * 
     * @param event
Solution content 
        }
    }

<<<<<<< HEAD
    /**
     * Called when a player left clicks air.
     *
     * @param event
     */
    public void handleAirLeftClick(PlayerInteractEvent event) {
         //I don't think we have to do anything here yet.
         return;
    }

    /**
     * Called when a player left clicks a block.
     *
     * @param event
     */
    public void handleBlockLeftClick(PlayerInteractEvent event) {
        if (event.isCancelled()) return;

        Player player = event.getPlayer();
        Block block = event.getClickedBlock();
        Material type = block.getType();
        World world = player.getWorld();

        ConfigurationManager cfg = plugin.getGlobalConfiguration();
        WorldConfiguration wcfg = cfg.get(world);

        if (wcfg.useRegions) {
            Vector pt = toVector(block);
            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
            LocalPlayer localPlayer = plugin.wrapPlayer(player);

            if (type == Material.STONE_BUTTON
                  || type == Material.LEVER
                  || type == Material.WOODEN_DOOR
                  || type == Material.NOTE_BLOCK) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.allows(DefaultFlag.USE)
                        && !set.canBuild(localPlayer)) {
                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to use that in this area.");
                    event.setCancelled(true);
                    return;
                }
            }
        }
    }

    /**
=======
    /**
     * Called when a player left clicks air.
     *
     * @param event
     */
    public void handleAirLeftClick(PlayerInteractEvent event) {
         //I don't think we have to do anything here yet.
         return;
    }

    /**
     * Called when a player left clicks a block.
     *
     * @param event
     */
    public void handleBlockLeftClick(PlayerInteractEvent event) {
        if (event.isCancelled()) return;

        Player player = event.getPlayer();
        Block block = event.getClickedBlock();
        Material type = block.getType();
        World world = player.getWorld();

        ConfigurationManager cfg = plugin.getGlobalConfiguration();
        WorldConfiguration wcfg = cfg.get(world);

        if (wcfg.useRegions) {
            Vector pt = toVector(block);
            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
            LocalPlayer localPlayer = plugin.wrapPlayer(player);

            if (type == Material.STONE_BUTTON
                  || type == Material.LEVER
                  || type == Material.WOODEN_DOOR
                  || type == Material.NOTE_BLOCK) {
                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
                        && !set.allows(DefaultFlag.USE)
                        && !set.canBuild(localPlayer)) {
                    player.sendMessage(ChatColor.DARK_RED + "You don't have permission to use that in this area.");
                    event.setCancelled(true);
                    return;
                }
            }
        }
    }

    /**
>>>>>>> 19d447d67d0c4620368069a00c20812325916b2e
     * Called when a player right clicks air.
     * 
     * @param event
File
WorldGuardPlayerListener.java
Developer's decision
Manual
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
    };
    public static final DoubleFlag PRICE = new DoubleFlag("price");
    
    public static final Flag[] flagsList = new Flag[] {
<<<<<<< HEAD
        PASSTHROUGH, BUILD, PVP, MOB_DAMAGE, MOB_SPAWNING, CREEPER_EXPLOSION, SLEEP,
        TNT, LIGHTER, FIRE_SPREAD, LAVA_FIRE, CHEST_ACCESS, WATER_FLOW, LAVA_FLOW,
        USE, PLACE_VEHICLE, GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_GREET,
        NOTIFY_FAREWELL, DENY_SPAWN, HEAL_DELAY, HEAL_AMOUNT, TELE_LOC,
        TELE_PERM, SPAWN_LOC, SPAWN_PERM, BUYABLE, PRICE
=======
        PASSTHROUGH, BUILD, PVP, MOB_DAMAGE, MOB_SPAWNING, CREEPER_EXPLOSION,
        TNT, LIGHTER, FIRE_SPREAD, LAVA_FIRE, LIGHTNING, CHEST_ACCESS,
        WATER_FLOW, LAVA_FLOW, USE, PLACE_VEHICLE, GREET_MESSAGE,
        FAREWELL_MESSAGE, NOTIFY_GREET, NOTIFY_FAREWELL, DENY_SPAWN,
        HEAL_DELAY, HEAL_AMOUNT, TELE_LOC,TELE_PERM, SPAWN_LOC, SPAWN_PERM,
        BUYABLE, PRICE, SLEEP
>>>>>>> 19d447d67d0c4620368069a00c20812325916b2e
    
    private DefaultFlag() {
Solution content 
    public static final DoubleFlag PRICE = new DoubleFlag("price");
    
    public static final Flag[] flagsList = new Flag[] {
<<<<<<< HEAD
        PASSTHROUGH, BUILD, PVP, MOB_DAMAGE, MOB_SPAWNING, CREEPER_EXPLOSION, SLEEP,
        TNT, LIGHTER, FIRE_SPREAD, LAVA_FIRE, CHEST_ACCESS, WATER_FLOW, LAVA_FLOW,
        USE, PLACE_VEHICLE, GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_GREET,
        NOTIFY_FAREWELL, DENY_SPAWN, HEAL_DELAY, HEAL_AMOUNT, TELE_LOC,
        TELE_PERM, SPAWN_LOC, SPAWN_PERM, BUYABLE, PRICE
=======
        PASSTHROUGH, BUILD, PVP, MOB_DAMAGE, MOB_SPAWNING, CREEPER_EXPLOSION,
        TNT, LIGHTER, FIRE_SPREAD, LAVA_FIRE, LIGHTNING, CHEST_ACCESS,
        WATER_FLOW, LAVA_FLOW, USE, PLACE_VEHICLE, GREET_MESSAGE,
        FAREWELL_MESSAGE, NOTIFY_GREET, NOTIFY_FAREWELL, DENY_SPAWN,
        HEAL_DELAY, HEAL_AMOUNT, TELE_LOC,TELE_PERM, SPAWN_LOC, SPAWN_PERM,
        BUYABLE, PRICE, SLEEP
>>>>>>> 19d447d67d0c4620368069a00c20812325916b2e
    };
    
    private DefaultFlag() {
File
DefaultFlag.java
Developer's decision
Manual
Kind of conflict
Attribute