Commit Graph

19 Commits

Author SHA1 Message Date
RednedEpic 2bdf3d4d7f Merge branch 'master' into plugin 2020-02-26 19:31:19 -06:00
RednedEpic 41a24ca6ab Merge branch 'master' into plugin 2020-02-16 13:25:37 -06:00
AJ Ferguson 9008036ee4 Merge remote-tracking branch 'remotes/upstream/master' into chunk-fix
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
#	connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
#	connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
2020-02-10 17:38:56 -09:00
AJ Ferguson 516fc51162 Small changes 2020-02-05 20:23:06 -09:00
AJ Ferguson e4ab4b336c Chunk fixes 2020-02-05 19:32:33 -09:00
OnlyBMan 4dff067faa Add biomes 2020-02-05 21:10:34 -05:00
RednedEpic 52b23950ea Merge branch 'master' into plugin (should fix building) 2020-01-18 16:46:07 -06:00
RednedEpic dc594ee22c Update license headers
Certain headers for classes that are to be removed (e.g. plugin api) were not updated to prevent merge conflicts.
2020-01-08 21:05:42 -06:00
RednedEpic e38322a3ec Nuke plugin API
https://media.giphy.com/media/oe33xf3B50fsc/giphy.gif
2019-12-21 11:35:48 -06:00
RednedEpic 20dda985bc Comment out unneeded collision code
This may be handy in the future, but right now it serves no purpose.
2019-10-16 13:10:27 -05:00
Tim203 15506cf5b4 Edited PlayerInit behavior and updated protocol lib to 2.3.0 2019-10-09 20:39:38 +02:00
Tim203 cbdf4f7633 Made paintings not crash the client, bugfixes and improvements 2019-09-21 09:42:44 +02:00
Redned 7f051bd6bc Start work on a basic chunk cache and block collision detection 2019-09-15 18:34:14 -05:00
RednedEpic 03bf12ee65 Implement more block mappings 2019-09-13 18:49:46 -05:00
SupremeMortal c9be13d487
Fix AIOOBE and remove PlayerSession usage. 2019-09-13 15:45:55 +01:00
SupremeMortal 9a9f67b45f
Get chunks working to some degree. 2019-09-13 11:49:18 +01:00
SupremeMortal ed7213d7c7
Remove IntelliJ files @EOT3000 added... and more chunk changes. 2019-09-13 10:39:38 +01:00
SupremeMortal 7a6d3f4604
Various chunk tweaks. 2019-09-13 10:08:48 +01:00
RednedEpic 383429d71b Fix a few chunk errors
This does not fix chunks on its own, they're still very much a work in progress, however this commit should hopefully resolve a few issues. The client might still crash due to some invalid mappings (most likely), but this should bring us one step closer.

With hardcoded values for the chunks, the client wouldn't crash (which leads me to the conclusion stated above) and on the occasions that it would not time out, the chunks were empty.

Co-authored-by: SupremeMortal <suprememortal@users.noreply.github.com>
2019-09-08 15:46:10 -05:00