OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix a merge conflict that was resolved improperly

Browse source
This commit is contained in:
Zach Brown 2016-12-20 18:01:37 -06:00
parent ec68dfff5a
commit cd80c0a2f7
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Spigot-Server-Patches/Speedup-BlockPos-by-fixing-inlining.patch
View file

@ -87,12 +87,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- this.b.b = i; - this.b.b = i;
- this.b.c = j; - this.b.c = j;
- ++this.b.d; - ++this.b.d;
+ if (((BaseBlockPosition)this.b).a < l) { + if (((BaseBlockPosition) this.b).a < l) {
+ ++((BaseBlockPosition)this.b).a; + ++((BaseBlockPosition) this.b).a;
+ } else if (((BaseBlockPosition)this.b).b < i1) { + } else if (((BaseBlockPosition) this.b).b < i1) {
+ ((BaseBlockPosition)this.b).a = i; + ((BaseBlockPosition) this.b).a = i;
+ ++((BaseBlockPosition)this.b).b; + ++((BaseBlockPosition) this.b).b;
+ } else if (((BaseBlockPosition)this.b).c < j1) { + } else if (((BaseBlockPosition) this.b).c < j1) {
+ ((BaseBlockPosition) this.b).a = i; + ((BaseBlockPosition) this.b).a = i;
+ ((BaseBlockPosition) this.b).b = j; + ((BaseBlockPosition) this.b).b = j;
+ ++((BaseBlockPosition) this.b).c; + ++((BaseBlockPosition) this.b).c;

3
Spigot-Server-Patches/Timings-v2.patch
View file

@ -1169,9 +1169,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ entity.tickTimer.startTiming(); // Paper + entity.tickTimer.startTiming(); // Paper
this.h(entity); this.h(entity);
- SpigotTimings.tickEntityTimer.stopTiming(); // Spigot - SpigotTimings.tickEntityTimer.stopTiming(); // Spigot
+ entity.tickTimer.stopTiming(); // Paper
+ entity.tickTimer.startTiming(); // Paper
+ this.g(entity);
+ entity.tickTimer.stopTiming(); // Paper + entity.tickTimer.stopTiming(); // Paper
} catch (Throwable throwable1) { } catch (Throwable throwable1) {
+ entity.tickTimer.stopTiming(); + entity.tickTimer.stopTiming();