SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
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.c = j;
- ++this.b.d;
+ if (((BaseBlockPosition)this.b).a < l) {
+ ++((BaseBlockPosition)this.b).a;
+ } else if (((BaseBlockPosition)this.b).b < i1) {
+ ((BaseBlockPosition)this.b).a = i;
+ ++((BaseBlockPosition)this.b).b;
+ } else if (((BaseBlockPosition)this.b).c < j1) {
+ if (((BaseBlockPosition) this.b).a < l) {
+ ++((BaseBlockPosition) this.b).a;
+ } else if (((BaseBlockPosition) this.b).b < i1) {
+ ((BaseBlockPosition) this.b).a = i;
+ ++((BaseBlockPosition) this.b).b;
+ } else if (((BaseBlockPosition) this.b).c < j1) {
+ ((BaseBlockPosition) this.b).a = i;
+ ((BaseBlockPosition) this.b).b = j;
+ ++((BaseBlockPosition) this.b).c;