conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
using System;
using System.Linq;
using System.Threading.Tasks;
=======
>>>>>>>
using System;
using System.Linq;
using System.Threading.Tasks;
<<<<<<<
public partial class CourseService : ICourseService
{
private readonly IStorageBroker storageBroker;
private readonly ILoggingBroker loggingBroker;
pr... |
<<<<<<<
public interface IStudentContactService
{
ValueTask<StudentContact> AddStudentContactAsync(StudentContact studentContact);
IQueryable<StudentContact> RetrieveAllStudentContacts();
}
=======
public interface IStudentContactService
{
IQueryable<StudentContact> RetrieveAllStudentContacts()... |
<<<<<<<
public interface IStudentExamService
{
ValueTask<StudentExam> AddStudentExamAsync(StudentExam studentExam);
ValueTask<StudentExam> RetrieveStudentExamByIdAsync(Guid studentExamId);
ValueTask<StudentExam> DeleteStudentExamByIdAsync(Guid studentExamId);
}
=======
... |
<<<<<<<
using System.Collections.Generic;
using System.Linq;
=======
using System.Linq;
>>>>>>>
using System.Linq;
using System.Collections.Generic;
using System.Linq;
<<<<<<<
[Fact]
public async Task ShouldRetrieveTeacherByIdAsync()
{
// given
DateTimeOffset dateTime... |
<<<<<<<
public interface IStudentExamService
{
ValueTask<StudentExam> AddStudentExamAsync(StudentExam studentExam);
ValueTask<StudentExam> RetrieveStudentExamByIdAsync(Guid studentExamId);
ValueTask<StudentExam> DeleteStudentExamByIdAsync(Guid studentExamId);
}
=======
... |
<<<<<<<
using System;
=======
using System.Linq;
>>>>>>>
using System;
using System.Linq;
<<<<<<<
ValueTask<ExamAttachment> RetrieveExamAttachmentByIdAsync
(Guid examId, Guid attachmentId);
=======
IQueryable<ExamAttachment> RetrieveAllExamAttachments();
>>>>>>>
IQueryable<Ex... |
<<<<<<<
using System.Collections.Generic;
=======
using System.Linq;
>>>>>>>
using System.Linq;
using System.Collections.Generic;
<<<<<<<
private static int GetNegativeRandomNumber() => -1 * GetRandomNumber();
private static string GetRandomMessage() => new MnemonicString().GetValue();
publ... |
<<<<<<<
ValueTask<Guardian> ModifyGuardianAsync(Guardian guardian);
=======
IQueryable<Guardian> RetrieveAllGuardians();
>>>>>>>
IQueryable<Guardian> RetrieveAllGuardians();
ValueTask<Guardian> ModifyGuardianAsync(Guardian guardian); |
<<<<<<<
using OtripleS.Web.Api.Services.Students;
=======
using OtripleS.Web.Api.Services;
using OtripleS.Web.Api.Services.Teachers;
>>>>>>>
using OtripleS.Web.Api.Services.Students;
using OtripleS.Web.Api.Services.Teachers; |
<<<<<<<
[HttpPut]
public async ValueTask<ActionResult<Teacher>> PutTeacher(Teacher teacher)
{
try
{
Teacher updatedTeacher =
await this.teacherService.ModifyTeacherAsync(teacher);
return Ok(upd... |
<<<<<<<
using System;
using System.Threading.Tasks;
=======
>>>>>>>
<<<<<<<
=======
using Force.DeepCloner;
>>>>>>>
using Force.DeepCloner;
<<<<<<<
=======
using System;
using System.Threading.Tasks;
>>>>>>>
using System;
using System.Threading.Tasks;
<<<<<<<
public async Task ShouldCreateCourseA... |
<<<<<<<
public partial class ContactService
{
private void ValidateContactOnCreate(Contact contact)
{
ValidateContactIsNotNull(contact);
ValidateContactId(contact);
ValidateContactAuditFields(contact);
ValidateContactAuditFieldsOnCreate(contact);
... |
<<<<<<<
IQueryable<StudentSemesterCourse> RetrieveAllStudentSemesterCourses();
=======
ValueTask<StudentSemesterCourse> DeleteStudentSemesterCourseAsync(Guid semesterCourseId, Guid studentId);
>>>>>>>
IQueryable<StudentSemesterCourse> RetrieveAllStudentSemesterCourses();
ValueTask<Stu... |
<<<<<<<
ValueTask<StudentGuardian> RetrieveStudentGuardianByIdAsync(Guid studentId, Guid guardianId);
}
=======
ValueTask<StudentGuardian> AddStudentGuardianAsync(StudentGuardian studentGuardian);
}
>>>>>>>
ValueTask<StudentGuardian> RetrieveStudentGuardianByIdAsync(Guid studentId, Guid guardi... |
<<<<<<<
private void ValidateStorageExamAttachment(
ExamAttachment storageExamAttachment,
Guid examId,
Guid attachmentId)
{
if (storageExamAttachment == null)
throw new NotFoundExamAttachmentException(examId, attachmentId);
}
... |
<<<<<<<
using Autofac;
using DI;
=======
using System.Web.Mvc;
using System.Web.Routing;
using Autofac.Integration.Mvc;
>>>>>>>
using System.Web.Mvc;
using System.Web.Routing;
using Autofac;
using Autofac.Integration.Mvc;
using DI;
<<<<<<<
// DI
Contai... |
<<<<<<<
private static void ValidateStorageTeacherAttachment(
TeacherAttachment storageTeacherAttachment,
Guid studentId,
Guid attachmentId)
{
if (storageTeacherAttachment == null)
{
throw new NotFoundTeacherAttachmentExceptio... |
<<<<<<<
=======
using System;
using System.Linq;
using System.Threading.Tasks;
>>>>>>>
using System;
using System.Linq;
using System.Threading.Tasks; |
<<<<<<<
=======
using System;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Data.SqlClient;
using Microsoft.EntityFrameworkCore;
>>>>>>>
using Microsoft.Data.SqlClient;
using Microsoft.EntityFrameworkCore;
<<<<<<<
using System;
using System.Linq;
using System.Threading.Tasks;
=======
using Otri... |
<<<<<<<
public ValueTask<StudentSemesterCourse> CreateStudentSemesterCourseAsync(StudentSemesterCourse inputStudentSemesterCourse);
ValueTask<StudentSemesterCourse> RetrieveStudentSemesterCourseByIdAsync(Guid studentId, Guid SemesterCourseId);
=======
ValueTask<StudentSemesterCourse> RetrieveS... |
<<<<<<<
public partial class GuardianService
{
private void ValidateGuardianId(Guid guardianId)
{
if (guardianId == default)
{
throw new InvalidGuardianException(
parameterName: nameof(Guardian.Id),
parameterValue: guardianId);
}
}
private void ValidateStorageGuardian(Guardian storageG... |
<<<<<<<
ValueTask<Course> DeleteCourseAsync(Guid courseId);
IQueryable<Course> RetrieveAllCourses();
ValueTask<Course> RetrieveCourseById(Guid courseId);
=======
ValueTask<Course> ModifyCourseAsync(Course course);
ValueTask<Course> DeleteCourseAsync(Guid CourseId);
>>>>>>>
... |
<<<<<<<
using System;
using System.Linq;
=======
>>>>>>>
using System.Linq;
<<<<<<<
private void ValidateStorageCourses(IQueryable<Course> storageCourses)
{
if (storageCourses.Count() == 0)
{
this.loggingBroker.LogWarning("No courses found in storage.");
... |
<<<<<<<
public ValueTask<CalendarEntry> DeleteCalendarEntryByIdAsync(Guid calendarEntryId)
{
throw new NotImplementedException();
}
public ValueTask<CalendarEntry> ModifyCalendarEntryAsync(CalendarEntry calendarEntry)
{
throw new NotImplementedException()... |
<<<<<<<
=======
string on = join.AssociationType.GetOnCondition(join.Alias, factory, enabledFilters);
SqlString condition = new SqlString();
if (last != null &&
IsManyToManyRoot(last) &&
((IQueryableCollection)last).ElementType == join.AssociationType)
{
// the current join represents... |
<<<<<<<
var retrieveOperation = TableOperation.Retrieve<ApiRegistrationTableEntity>(ApiRegistrationTableEntity.GetPartitionKey(ApiRegistrationKey.Default),
ApiRegistrationTableEntity.GetRowKey(ApiRegistrationKey.Default));
var retrievedResult = _table.Exec... |
<<<<<<<
[Theory, Explicit("Bench")]
public void BenchTransactionAccess(bool inTransaction)
{
var currentTransaction = System.Transactions.Transaction.Current;
using (inTransaction ? new TransactionScope() : null)
using (var s = OpenSession())
{
var impl = s.GetSessionImplementation();
var tra... |
<<<<<<<
[Test(Description = "NH-3261")]
=======
[Test]
[Description("NH-3337")]
public void ProductWithDoubleStringContainsAndNotNull()
{
// Consider this WCF DS query will fail:
// http://.../Products()?$filter=substringof("23",Code) and substringof('2',Name)
//
// It will generate a LINQ expr... |
<<<<<<<
using NHibernate.Util;
=======
using Remotion.Linq.Clauses.Expressions;
>>>>>>>
using NHibernate.Util;
using Remotion.Linq.Clauses.Expressions; |
<<<<<<<
public override bool SupportsAggregateInSubSelect => true;
/// <inheritdoc />
public override bool SupportsRowValueConstructorSyntax => true;
=======
/// <summary>
/// Npgsql does not clone the transaction in its context, and uses it in its prepare phase. When that was a
/// dependent transacti... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
private const int MaxDevicesToDisplayOnDashboard = 200;
=======
>>>>>>>
private const int MaxDevicesToDisplayOnDashboard = 200;
<<<<<<<
private readonly IDeviceLogic _deviceLogic;
private readonly IConfigurationProvider _configProvider;
=====... |
<<<<<<<
=======
using System.Configuration;
>>>>>>>
using System.Configuration; |
<<<<<<<
#region Constants
private const int MaxDevicesToDisplayOnDashboard = 200;
private const double CautionAlertMaxMinutes = 91.0;
private const double CriticalAlertMaxMinutes = 11.0;
=======
>>>>>>>
private const int MaxDevicesToDisplayOnDashboard = 200;
private... |
<<<<<<<
await ConfigureServiceSource(Config);
await CreateLoadBalancer().GetNode();
=======
ConfigureServiceSource(Config);
await CreateLoadBalancer().TryGetNode();
>>>>>>>
await ConfigureServiceSource(Config);
await CreateLoadBalancer().TryGetN... |
<<<<<<<
OnStopWaitTimeMS = TryParseInt(ParseStringArg(nameof(OnStopWaitTimeMS), args));
=======
ProcessorAffinity = ParseProcessorIds(ParseStringArg(nameof(ProcessorAffinity), args));
>>>>>>>
OnStopWaitTimeMS = TryParseInt(ParseStringArg(nameof(OnStopWaitTimeMS), args));
... |
<<<<<<<
/// <summary>Find all mods in the given folder.</summary>
/// <param name="rootPath">The root mod path to search.</param>
/// <param name="jsonHelper">The JSON helper with which to read the manifest file.</param>
/// <param name="deprecationWarnings">A list to populate with any d... |
<<<<<<<
using Feature.FormsExtensions.Fields.Bindings;
using Sitecore;
=======
using System;
using Feature.FormsExtensions.Fields.Bindings;
>>>>>>>
using System;
using Feature.FormsExtensions.Fields.Bindings;
using Sitecore; |
<<<<<<<
[Imported(ObeysTypeSystem = true)]
public struct UInt32 {
=======
[Imported(IsRealType = true)]
public struct UInt32 : IHashable<UInt32> {
>>>>>>>
[Imported(ObeysTypeSystem = true)]
public struct UInt32 : IHashable<UInt32> { |
<<<<<<<
new PersistentConnection(configuration, connectionFactory, new EventBus()),
serializer,
=======
connectionFactory,
serializer,
>>>>>>>
new PersistentConnection(configuration, connectionFactory, new EventBus()),
se... |
<<<<<<<
var publishExchangeDeclareStrategy = new VersionedPublishExchangeDeclareStrategy(Substitute.For<IConventions>(), advancedBus);
try
{
publishExchangeDeclareStrategy.DeclareExchange(exchangeName, ExchangeType.Topic);
}
catch (Exception)
... |
<<<<<<<
public async Task FuturePublishAsync<T>(T message, TimeSpan delay, string topic = null, CancellationToken cancellationToken = default)
=======
public Task FuturePublishAsync<T>(DateTime futurePublishDate, T message, string cancellationKey = null) where T : class
{
return Fu... |
<<<<<<<
using System.Threading;
#if NETFX
using System.Diagnostics;
using System.Reflection;
using System.Reflection.Emit;
#endif
=======
>>>>>>>
using System.Threading; |
<<<<<<<
[assembly: AssemblyVersion("0.48.0.0")]
=======
[assembly: AssemblyVersion("0.47.10.0")]
>>>>>>>
[assembly: AssemblyVersion("0.48.0.0")]
<<<<<<<
// 0.48.0.0 Updated to RabbitMQ.Client 3.5
=======
// 0.47.10.0 RabbitHutch.CreateBus overloads
// 0.47.9.0 TypeNameSerializer now uses a ConcurrentDictionary to... |
<<<<<<<
private readonly AdvancedBusEventHandlers advancedBusEventHandlers;
=======
private readonly IConventions conventions;
>>>>>>>
private readonly IConventions conventions;
private readonly AdvancedBusEventHandlers advancedBusEventHandlers;
<<<<<<<
IMessageSerializat... |
<<<<<<<
// Note: until version 1.0 expect breaking changes on 0.X versions.
[assembly: AssemblyVersion("0.64.2.0")]
=======
>>>>>>>
<<<<<<<
// Note: until version 1.0 expect breaking changes on 0.X versions.
// 0.64.2.0 Add durability queue on subscription
// 0.64.1.0 Hosepipe custom broker port configuration by se... |
<<<<<<<
await bus.PubSub.PublishBatchAsync(messages, timeoutCts.Token).ConfigureAwait(false);
=======
await bus.PublishBatchAsync(messages, cts.Token).ConfigureAwait(false);
>>>>>>>
await bus.PubSub.PublishBatchAsync(messages, cts.Token).ConfigureAwait(fals... |
<<<<<<<
await bus.Scheduler.FuturePublishBatchAsync(messages, TimeSpan.FromSeconds(5), cts.Token)
=======
await bus.FuturePublishBatchAsync(messages, TimeSpan.FromSeconds(5), "#", cts.Token)
>>>>>>>
await bus.Scheduler.FuturePublishBatchAsync(messages, TimeSpan.FromSec... |
<<<<<<<
public struct SerializedProgram : IAssetReadable
{
public void Read(AssetReader reader)
{
m_subPrograms = reader.ReadArray<SerializedSubProgram>();
}
Dictionary<ShaderGpuProgramType, int> GetIsTierLookup(IReadOnlyList<SerializedSubProgram> subPrograms)
... |
<<<<<<<
private MD5 md5 = MD5.Create();
public IEnumerable<byte[]> Execute(int split, IEnumerable<KeyValuePair<K1, V1>> input)
=======
private static MD5 md5 = MD5.Create();
private readonly int numPartitions;
private readonly Func<dynamic, int> partitionFun... |
<<<<<<<
Func<double, RDD<dynamic>, RDD<dynamic>, RDD<dynamic>> func = new UpdateStateByKeysHelper<K, V, S>(updateFunc, prevFunc, initialState, numPartitions).Execute;
=======
Func<double, RDD<dynamic>, RDD<dynamic>, RDD<dynamic>> func = new UpdateStateByKeysHelper<K, V, S>(updateFunc, numParti... |
<<<<<<<
IDataFrameReaderProxy Read();
=======
IDataFrameProxy CreateDataFrame(IRDDProxy rddProxy, IStructTypeProxy structTypeProxy);
>>>>>>>
IDataFrameReaderProxy Read();
IDataFrameProxy CreateDataFrame(IRDDProxy rddProxy, IStructTypeProxy structTypeProxy); |
<<<<<<<
Factory.MetaCode("section").Accepts(AcceptedCharactersInternal.None),
Factory.Span(SpanKindInternal.Code, " ", CSharpSymbolType.WhiteSpace).Accepts(AcceptedCharactersInternal.WhiteSpace),
Factory.Span(SpanKindInternal.Code, "Foo", CSharpSym... |
<<<<<<<
private void GenerateExtraBoonData(ParsedLog log, long boonid, Point[] accurateUptime, List<PhaseData> phases)
=======
private void generateExtraBoonData(ParsedLog log, long boonid, BoonSimulationResult boonSimulation, List<PhaseData> phases)
>>>>>>>
private void generateExtraBoonData... |
<<<<<<<
new Mechanic(31722, "Spirited Fusion", Mechanic.MechType.EnemyBoon, ParseEnum.BossIDS.Gorseval, "symbol:'square',color:'rgb(255,140,0)',", "SprtBf",0), // Spirited Fusion (Consumed a Spirit), Ate Spirit
new Mechanic(31720, "Kick", Mechanic.MechType.SkillOnPlayer, ParseEnum.BossIDS.Gorsev... |
<<<<<<<
IsCondi = dl.IsCondi,
ID = dl.SkillId,
=======
Condi = dl.IsIndirectDamage,
Skill = dl.SkillId,
>>>>>>>
IsCondi = dl.IsIndirectDamage,
ID = d... |
<<<<<<<
#if !DEBUG
[assembly: AssemblyVersion("2.7.1.0")]
=======
#if PROD
[assembly: AssemblyVersion("2.8.0.0")]
>>>>>>>
#if !DEBUG
[assembly: AssemblyVersion("2.8.0.0")] |
<<<<<<<
using Microsoft.AspNet.Hosting;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting.Internal;
=======
>>>>>>>
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting.Internal; |
<<<<<<<
List<AbstractCastEvent> cls = mainTarget.GetCastEvents(log, 0, log.FightData.FightEnd);
=======
IReadOnlyList<AbstractCastEvent> cls = mainTarget.GetCastLogs(log, 0, log.FightData.FightEnd);
>>>>>>>
IReadOnlyList<AbstractCastEvent> cls = mainTarget.GetCastEvents(log, 0, lo... |
<<<<<<<
CombatItem dead = log.CombatData.LastOrDefault(x => x.SrcInstid == AgentItem.InstID && x.IsStateChange.IsDead() && x.Time >= start + offset && x.Time <= end + offset);
=======
CombatItem dead = log.CombatData.GetStatesData(ParseEnum.StateChange.ChangeDead).LastOrDefault(x => x.SrcInsti... |
<<<<<<<
string name = pair.Key.TrimEnd(" \0".ToArray());
playerDto.minions.Add(new MinionDto(pair.Value.MinionID, name));
=======
playerDto.minions.Add(new MinionDto(pair.Value.InstID, pair.Key.TrimEnd(" \0".ToArray())));
>>>>>>>
playerD... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
Dictionary<string, List<Statistics.ExtraBoonData>> toCheck = p.GetExtraBoonData(_log, null);
dmgCommonModifiersBuffs.UnionWith(toCheck.Keys.Select(x => Boon.BoonsByName[x].ID));
}*/
=======
Dictionary<long, List<Statisti... |
<<<<<<<
boss.AvgBoons = _statistics.AvgTargetBoons[target];
boss.AvgConditions = _statistics.AvgTargetConditions[target];
boss.Dps = BuildDPS(_statistics.TargetDps[target]);
boss.Buffs = BuildBossBuffs(_statistics.TargetConditions[target], target);
... |
<<<<<<<
public List<int> Get1SDamageList(ParsedEvtcLog log, long start, long end, AbstractActor target)
=======
public IReadOnlyList<int> Get1SDamageList(ParsedEvtcLog log, int phaseIndex, PhaseData phase, AbstractActor target)
>>>>>>>
public IReadOnlyList<int> Get1SDamageList(ParsedEvtcLog l... |
<<<<<<<
List<AbstractCastEvent> cls = actor.GetCastEvents(log, start, end);
=======
IReadOnlyList<AbstractCastEvent> cls = actor.GetCastLogs(log, start, end);
>>>>>>>
IReadOnlyList<AbstractCastEvent> cls = actor.GetCastEvents(log, start, end); |
<<<<<<<
mode = ParseMode.Fractal;
mechanicList.AddRange(new List<Mechanic>
{
new Mechanic(37154, "Lunge", Mechanic.MechType.SkillOnPlayer, ParseEnum.BossIDS.Ensolyss, "symbol:'circle',color:'rgb(50,150,0)',", "Charge",0),
new Mechanic(37278, "Upswing", Mecha... |
<<<<<<<
if (pair.Value.First().IsCondi)
=======
if (!pair.Value.First().IsIndirectDamage && skill != null)
>>>>>>>
if (pair.Value.First().IsIndirectDamage)
<<<<<<<
string prefix = filteredList.First().IsCondi ? "b" : "s";
res.Add(new Js... |
<<<<<<<
public override List<AbstractHealthDamageEvent> GetDamageEvents(AbstractActor target, ParsedEvtcLog log, long start, long end)
=======
public override IReadOnlyList<AbstractHealthDamageEvent> GetDamageLogs(AbstractActor target, ParsedEvtcLog log, long start, long end)
>>>>>>>
public o... |
<<<<<<<
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
public readonly partial struct EventCallback
{
private readonly object _dummy;
private readonly int _dummyPrimitive;
public static readonly Microsoft.AspNetCore.Compon... |
<<<<<<<
List<AbstractCastEvent> cls = dhuum.GetCastEvents(log, 0, log.FightData.FightEnd);
=======
IReadOnlyList<AbstractCastEvent> cls = dhuum.GetCastLogs(log, 0, log.FightData.FightEnd);
>>>>>>>
IReadOnlyList<AbstractCastEvent> cls = dhuum.GetCastEvents(log, 0, log.FightData.Fig... |
<<<<<<<
Mode = ParseMode.Fractal;
=======
mode = ParseMode.Fractal;
mechanicList.AddRange(new List<Mechanic>
{
new Mechanic(37695, "Flux Bomb", Mechanic.MechType.PlayerBoon, ParseEnum.BossIDS.Unknown, "symbol:'circle',color:'rgb(150,0,255)',size:10,", "FBmb"... |
<<<<<<<
HTMLBuilder builder = new HTMLBuilder(log, settings, statistics,uploadresult);
=======
var builder = new HTMLBuilder(log, settings, statistics);
>>>>>>>
var builder = new HTMLBuilder(log, settings, statistics,uplo... |
<<<<<<<
int transfoEnd = (int)(c.Time - log.FightData.FightStart);
replay.AddCircleActor(new CircleActor(true, 0, 160, new Tuple<int, int>(transfoStart, transfoEnd), "rgba(0, 80, 255, 0.3)"));
=======
int transfoEnd = (int)(c.Time - log.GetBossData().GetFirs... |
<<<<<<<
public List<long> Conditions;
public string EncounterDuration;
public bool Success;
public string FightName;
public string FightIcon;
public bool CombatReplay;
public bool LightTheme;
public bool NoMechanics;
public bool SingleGroup;
=====... |
<<<<<<<
this.ClientSize = new System.Drawing.Size(579, 524);
this.Controls.Add(this.chkHtmlExperimental);
=======
this.ClientSize = new System.Drawing.Size(853, 553);
this.Controls.Add(this.UploadRaidar_check);
this.Controls.Add(this.UploadDRRH_check);
... |
<<<<<<<
this.label1 = new System.Windows.Forms.Label();
this.UploadDPSReports_checkbox = new System.Windows.Forms.CheckBox();
this.UploadDRRH_check = new System.Windows.Forms.CheckBox();
this.UploadRaidar_check = new System.Windows.Forms.CheckBox();
=======
... |
<<<<<<<
public IConfiguration Configuration { get; set; }
public IHostingEnvironment Environment { get; set; }
private void CheckSameSite(HttpContext httpContext, CookieOptions options)
{
if (options.SameSite > (SameSiteMode)(-1))
{
var userAgent... |
<<<<<<<
Id = skill.ID,
Name = skill.Name,
Icon = skill.Icon,
Aa = (apiSkill?.slot == "Weapon_1")
=======
id = skill.ID,
name = skill.Name,
icon = skill.Icon,
... |
<<<<<<<
=======
new Boon("Stun", 872, BoonSource.Mixed, BoonType.Duration, 1, BoonNature.GraphOnlyBuff, Logic.ForceOverride, "https://wiki.guildwars2.com/images/9/97/Stun.png"),
new Boon("Daze", 833, BoonSource.Mixed, BoonType.Duration, 1, BoonNature.GraphOnlyBuff, Logic.ForceOverride,... |
<<<<<<<
NPC mainTarget = Targets.Find(x => x.ID == TriggerID);
=======
Target mainTarget = Targets.Find(x => x.ID == GenericTriggerID);
>>>>>>>
NPC mainTarget = Targets.Find(x => x.ID == GenericTriggerID); |
<<<<<<<
NPC target = Targets.Find(x => x.ID == TriggerID);
NPC leftArm = Targets.Find(x => x.ID == (ushort)ParseEnum.TargetIDS.CALeftArm);
NPC rightArm = Targets.Find(x => x.ID == (ushort)ParseEnum.TargetIDS.CARightArm);
=======
Target target = Targets.F... |
<<<<<<<
private List<int> _data = new List<int>();
=======
protected List<(double angle, long time)> Data = new List<(double angle, long time)>();
>>>>>>>
protected List<int> Data = new List<int>();
<<<<<<<
_data.Add(-Point3D.GetRotationFromFacing(facing));
=======
... |
<<<<<<<
List<AbstractCastEvent> castLogs = mainTarget.GetCastEvents(log, 0, log.FightData.FightEnd);
AbstractCastEvent abo = castLogs.Find(x => x.SkillId == 34427);
=======
IReadOnlyList<AbstractCastEvent> castLogs = mainTarget.GetCastLogs(log, 0, log.FightD... |
<<<<<<<
int totalDamage = GetTotalDamage(p, log, target, phase.Start, phase.End);
List<AbstractHealthDamageEvent> typeHits = GetHitDamageLogs(p, log, target, phase.Start, phase.End);
=======
int totalDamage = GetTotalDamage(p, log, target, i);
... |
<<<<<<<
private List<Point3D> _positions = new List<Point3D>();
private List<Point3D> _velocities = new List<Point3D>();
public List<Point3D> Rotations { get; } = new List<Point3D>();
=======
public List<Point3D> Positions { get; private set; } = new List<Point3D>();
public Lis... |
<<<<<<<
TotalDamageDist[i] = JsonDamageDist.BuildJsonDamageDistList(minions.GetDamageEvents(null, log, phase.Start, phase.End).GroupBy(x => x.SkillId).ToDictionary(x => x.Key, x => x.ToList()), log, skillDesc, buffDesc);
=======
totalDamageDist[i] = JsonDamageDist.BuildJsonDamageDistLi... |
<<<<<<<
public readonly string BuildVersion;
public string PoV { get; private set; } = "N/A";
public string LogStart { get; private set; } = "yyyy-MM-dd HH:mm:ss z";
public string LogEnd { get; private set; } = "yyyy-MM-dd HH:mm:ss z";
=======
public readonly String BuildVersio... |
<<<<<<<
// UTILITIES
=======
new Boon("Avocado Smoothie",50091, BoonSource.Item, BoonType.Duration, 1, BoonEnum.Food,RemoveType.None, Logic.Override, "https://wiki.guildwars2.com/images/8/83/Avocado_Smoothie.png"),
new Boon("Carrot Souffle",-1, BoonSource.Item, BoonTyp... |
<<<<<<<
List<AbstractCastEvent> cls = target.GetCastEvents(log, 0, log.FightData.FightEnd);
=======
IReadOnlyList<AbstractCastEvent> cls = target.GetCastLogs(log, 0, log.FightData.FightEnd);
>>>>>>>
IReadOnlyList<AbstractCastEvent> cls = target.GetCastEvents(log, 0, log.FightData.... |
<<<<<<<
RxThread = new Thread(RxProc) {IsBackground = true};
=======
RxThread = new Thread(RxProc) { IsBackground = true };
>>>>>>>
RxThread = new Thread(RxProc) { IsBackground = true };
<<<<<<<
private void SetHealth(short health)
{
if (health > 20)
... |
<<<<<<<
using System.Linq;
=======
using System.Collections.Generic;
>>>>>>>
using System.Linq;
using System.Collections.Generic; |
<<<<<<<
Register(PacketType.Transaction,5,0, ReadTransaction);
=======
Register(PacketType.UpdateSign, 0, 11, ReadUpdateSign);
>>>>>>>
Register(PacketType.Transaction,5,0, ReadTransaction);
Register(PacketType.UpdateSign, 0, 11, ReadUpdateSign);
<<<<<<<
publi... |
<<<<<<<
using System.Net.Sockets;
#if NET46
=======
>>>>>>>
#if NET46
<<<<<<<
public static bool TryParseTemplate(string template, out Template result, out string error)
=======
public static bool TryParseTemplate(string template, out Template result, out string error, bool haltOnError = true)
>... |
<<<<<<<
Factory.MetaCode("section").Accepts(AcceptedCharactersInternal.None),
Factory.Span(SpanKindInternal.Code, " ", CSharpSymbolType.WhiteSpace).Accepts(AcceptedCharactersInternal.WhiteSpace),
Factory.Span(SpanKindInternal.Code, "foo", CSharpSym... |
<<<<<<<
[Test]
public void SetPostDownloadStatus_Invalid_EpisodeId()
{
var db = MockLib.GetEmptyDatabase();
var mocker = new AutoMoqer();
mocker.SetConstant(db);
var postDownloadStatus = PostDownloadStatusType.Failed;
var fakeSeries ... |
<<<<<<<
using Ninject;
=======
using NzbDrone.Model;
>>>>>>>
using Ninject;
using NzbDrone.Model;
<<<<<<<
=======
public virtual AuthenticationType AuthenticationType
{
get { return (AuthenticationType)GetValueInt("AuthenticationType", 0); }
set { SetValue("AuthenticationT... |
<<<<<<<
var progressNotification = new ProgressNotification("Settings");
_notificationProvider.Register(progressNotification);
=======
>>>>>>>
_notificationProvider.Register(progressNotification);
<<<<<<<
var progressNotification = new ProgressNotification("Settings"... |
<<<<<<<
_logger.Info("Skipping refresh of artist: {0}", artist.ArtistName);
_diskScanService.Scan(artist);
=======
_logger.Info("Skipping refresh of artist: {0}", artist.Name);
//TODO: _diskScanService.Sca... |
<<<<<<<
public override bool SupportsPaging
{
get
{
return false;
}
}
=======
public override IEnumerable<string> GetSearchUrls(string query, int offset)
{
return new List<string>();
}
>>>>>>>
... |
<<<<<<<
using NzbDrone.Model;
=======
using Ninject;
>>>>>>>
using Ninject;
using NzbDrone.Model;
<<<<<<<
public virtual AuthenticationType AuthenticationType
{
get { return (AuthenticationType)GetValueInt("AuthenticationType", 0); }
set { SetValue("AuthenticationType", (int)... |
<<<<<<<
[Row("2011.01.10 - Denis Leary - HD TV.mkv", 2011, 1, 10)]
[Row("2011.03.13 - Denis Leary - HD TV.mkv", 2011, 3, 13)]
=======
[Row("2011.01.10 - Denis Leary - HD TV.mkv","", 2011, 1, 10)]
[Row("2011.03.13 - Denis Leary - HD TV.mkv", "", 2011, 3, 13)]
[Row("2011-03-13 - ... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.