Aikar
20bf0ed9ea
Update upstream
2018-07-29 22:16:15 -04:00
Shane Freeder
5abfd8100e
Update CB/S
2018-07-28 03:38:13 +01:00
Aikar
817b9934c7
Merge branch 'master' into pre/1.13
...
* master:
Relookup Entity Save ID if was null during precache
2018-07-27 00:44:53 -04:00
Aikar
3c8a4cb1bb
Relookup Entity Save ID if was null during precache
...
Should fix #1280
Citizens hijacks entity map, and im guessing under the right conditions
the result might actually be null during entity creation
Pre the cache patch, the id is looked up on save, so it was fine.
Now, if its null and the save ID is requested, we will try to look
it up again and cache it if found.
2018-07-26 23:57:31 -04:00
Aikar
af3bd62f9e
Merge pull request #1248
...
1cff9820
2018-07-23 20:24:44 -04:00
Shane Freeder
0c14fc6ee6
Update B/CB/S
2018-07-23 09:39:55 +01:00
Aikar
1b778924c3
Rebuild patches for upstream merge
2018-07-21 16:43:00 -04:00
Aikar
33cf273156
Guard the Entity.SHARED_RANDOM from seed changes
...
I don't clearly see any, but as a protection for future changes.
2018-07-21 09:03:10 -04:00
Shane Freeder
bd34c3623b
NOT FINISHED! She compiles, and she... suffers the wrath of chunkgen...
2018-07-19 05:42:43 +01:00
Shane Freeder
93a7205ba8
NOT FINISHED!!! More progress on 1.13-pre7
...
This work is unfinished, keep your paws off this branch!
2018-07-16 16:34:55 +01:00
Aikar
fe9d5b5570
Fix issue with entity activation range check - #1199
2018-07-14 00:12:42 -04:00
Aikar
eb1140acce
Multitude of changes to attempt to fix #1199
2018-07-12 16:42:56 -04:00
Aikar
1ba951ee5d
Only use stored chunk ref if it matches current chunk registration
...
Closes #1197
While this really undoes a lot of the desired performance gains avoiding chunk lookups,
we sadly have to accept this because we are seeing lots of bugs with entities.
2018-07-08 22:39:46 -04:00
Aikar
93dc25ecec
Fix weird bugs with entities - Fixes #1195
2018-07-05 18:39:43 -04:00
Aikar
8778a2ef97
Current Chunk for Entity and Block Entities, counts by entity type
...
This enables us a fast reference to the entities current chunk instead
of having to look it up by hashmap lookups.
We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 03:55:24 -04:00
Shane Freeder
cf2f346ccb
Update B/CB
2018-02-24 04:03:32 +00:00
Nikita Rudy
9105e06867
Added options to disable additional ore generation in Mesa and Extreme Hills ( #1006 )
2018-02-13 03:44:50 +03:00
Zach Brown
c93e1ee068
Update upstream B/CB/S
2018-01-10 23:31:19 -06:00
Shane Freeder
6d76e5b46a
Update B/CB/S
2017-11-08 16:13:57 +00:00
Shane Freeder
fbeadaefff
Update CB ( #846 )
2017-08-09 19:44:28 +01:00
Zach Brown
9115bf4ca0
Update upstream CB
2017-07-22 20:16:06 -05:00
Zach Brown
1c208bf05b
Update upstream CB/S
2017-06-18 20:36:55 -05:00
Shane Freeder
8bb457e352
Update Paper to MC 1.12
2017-06-08 15:16:51 +01:00
Zach Brown
22910b09c3
Switch 1.12-pre2 to its own version checks
...
Fix stream formatting issue that had been bugging me
2017-05-15 10:28:28 -05:00
Zach Brown
ab4ae72fd5
Update to MC 1.12-pre2
2017-05-14 13:05:01 -05:00
