Projects >> ReportRTS >>6ba6a4feae6dc6d4c3f1338278f597926140d8d2

Chunk
Conflicting content
                return true;
            }
            int ticketId = dbManager.getLatestTicketIdByUser(userId);
<<<<<<< HEAD
            HelpRequest request = new HelpRequest("CONSOLE", ticketId, System.currentTimeMillis()/1000, message, 0, location.getBlockX(), location.getBlockY(), location.getBlockZ(), location.getYaw(), location.getPitch(), world);
            plugin.getServer().getPluginManager().callEvent(new ReportCreateEvent(request));
            plugin.requestMap.put(ticketId, request);
            if(plugin.notifyStaffOnNewRequest) RTSFunctions.messageMods(Message.parse("modreqFiledMod","CONSOLE", ticketId));
=======
            plugin.requestMap.put(ticketId, new HelpRequest("CONSOLE", ticketId, System.currentTimeMillis()/1000, message, 0, location.getBlockX(), location.getBlockY(), location.getBlockZ(), location.getYaw(), location.getPitch(), world));
            if(plugin.notifyStaffOnNewRequest) RTSFunctions.messageMods(Message.parse("modreqFiledMod","CONSOLE", ticketId), true);
>>>>>>> ad0ff04af9d0ae48af6fea14eb75a4e1bbeae289
            return true;
        }
        if(!RTSPermissions.canFileRequest(sender)) return true;
Solution content
                return true;
            }
            int ticketId = dbManager.getLatestTicketIdByUser(userId);
            plugin.requestMap.put(ticketId, new HelpRequest("CONSOLE", ticketId, System.currentTimeMillis()/1000, message, 0, location.getBlockX(), location.getBlockY(), location.getBlockZ(), location.getYaw(), location.getPitch(), world));
            if(plugin.notifyStaffOnNewRequest) RTSFunctions.messageMods(Message.parse("modreqFiledMod","CONSOLE", ticketId), true);
            return true;
        }
        if(!RTSPermissions.canFileRequest(sender)) return true;
File
ModreqCommand.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable