Projects >> Courier >>05dc219e77bba4773263cb9f07158d8d2409286d

Chunk
Conflicting content 
import org.bukkit.block.Biome;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
<<<<<<< HEAD
import org.bukkit.command.CommandSender;
import org.bukkit.entity.CreatureType;
import org.bukkit.entity.Entity;
=======
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.EntityType;
>>>>>>> b2e5c89b017f1b1e238a5ddbc1f084e4c0e4e83d
import org.bukkit.entity.Player;
import org.bukkit.inventory.FurnaceRecipe;
import org.bukkit.inventory.ItemStack;
Solution content 
import org.bukkit.block.Biome;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.inventory.FurnaceRecipe;
import org.bukkit.inventory.ItemStack;
File
Courier.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    private final boolean walkToPlayer;
    private final boolean freeLetter;
    private final List letterStacks = new ArrayList();
<<<<<<< HEAD
    private CreatureType type = null;

=======
    private EntityType type = null;
    private String greeting = null;
    private String maildrop = null;
    private String inventory = null;
    private String cannotDeliver = null;
    private String letterDrop = null;
    private String letterInventory = null;
    
>>>>>>> b2e5c89b017f1b1e238a5ddbc1f084e4c0e4e83d
    private final String version;
    
    public CourierConfig(Courier plug) {
Solution content 
    private final boolean walkToPlayer;
    private final boolean freeLetter;
    private final List letterStacks = new ArrayList();
    private EntityType type = null;
    private final String version;
    
    public CourierConfig(Courier plug) {
File
CourierConfig.java
Developer's decision
Combination
Kind of conflict
Attribute
Chunk
Conflicting content 
    @EventHandler(priority = EventPriority.MONITOR)
    public void onItemHeldChange(PlayerItemHeldEvent e) {
<<<<<<< HEAD
        // adding blind null check because of
        // http://dev.bukkit.org/server-mods/courier/tickets/63-could-not-pass-event-player-item-held-event-to-courier/
=======
        // http://dev.bukkit.org/server-mods/courier/tickets/36-severe-could-not-pass-event-player-item-held-event/
>>>>>>> b2e5c89b017f1b1e238a5ddbc1f084e4c0e4e83d
        ItemStack item = e.getPlayer().getInventory().getItem(e.getNewSlot());
        if(item != null && item.getType() == Material.MAP) {
            // legacy Courier support
Solution content 
    @EventHandler(priority = EventPriority.MONITOR)
    public void onItemHeldChange(PlayerItemHeldEvent e) {
        // http://dev.bukkit.org/server-mods/courier/tickets/36-severe-could-not-pass-event-player-item-held-event/
        ItemStack item = e.getPlayer().getInventory().getItem(e.getNewSlot());
        if(item != null && item.getType() == Material.MAP) {
            // legacy Courier support
File
CourierEventListener.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
public abstract class Postman {

    protected Creature postman;
<<<<<<< HEAD
    protected final CreatureType type;
=======
    protected EntityType type;
>>>>>>> b2e5c89b017f1b1e238a5ddbc1f084e4c0e4e83d
    protected final Courier plugin;
    protected final ItemStack letterItem;
    protected UUID uuid;
Solution content 
    protected final EntityType type;
public abstract class Postman {

    protected Creature postman;
    protected final Courier plugin;
    protected final ItemStack letterItem;
    protected UUID uuid;
File
Postman.java
Developer's decision
Manual
Kind of conflict
Attribute