Commit Graph

120 Commits

Author SHA1 Message Date
RednedEpic 4b001593fc Merge branch 'master' into inventory 2020-04-17 18:37:22 -05:00
rtm516 dc59be3901
Fix blank login causing error 2020-04-17 14:34:44 +01:00
RednedEpic 1cb2e658e0 Merge branch 'master' into inventory 2020-04-14 23:40:50 -05:00
RednedEpic b15d37a4c5 Print throwable for disconnection if present 2020-04-14 23:27:16 -05:00
RednedEpic 605c9ef4db Merge branch 'master' into inventory 2020-04-11 22:46:25 -05:00
AJ Ferguson f04a267d98 Only show login form if AuthType is Online 2020-04-11 10:53:27 -08:00
AJ Ferguson 95bcc04177 Fix crash on some devices when logging into a different dimension 2020-04-11 10:33:06 -08:00
rtm516 78fdab2090 Removed left in debug line 2020-04-09 17:34:49 +01:00
rtm516 81c1533ee2 en_us user now gets a chat message if the locale isnt already loaded 2020-04-09 17:21:51 +01:00
rtm516 013bca024c Removed auto download and load of en_us 2020-04-09 17:06:17 +01:00
rtm516 c51a48221b Merge remote-tracking branch 'origin/master' into server-language-processing 2020-04-09 13:58:45 +01:00
rtm516 c61d87714b On demand downloading and loading of language files 2020-04-09 00:20:41 +01:00
rtm516 55b2fd0259 Kick the user on incorrect login info 2020-04-05 10:42:02 +01:00
RednedEpic 392b0b5727 Merge branch 'master' into inventory 2020-04-04 03:12:23 -05:00
Redned ddf2f471ea
Merge branch 'master' into chunk-fix 2020-04-04 02:00:18 -05:00
RednedEpic 5222232e72 Add rest of fixes for operator bug 2020-03-26 23:00:52 -05:00
William Johnstone a0884596e3 Fix issue with players being able to update their own gamemode 2020-03-21 22:59:16 +00:00
RednedEpic 1bcee8d36f Merge branch 'master' into inventory 2020-03-15 13:21:37 -05:00
RednedEpic e203cfd4a7 Move back to XUID for Floodgate
The normal identity UUID caused problems and caused the bedrock client to crash when using Floodgate. This was likely because on bedrock edition, it's a version 3 UUID opposed to java edition which uses version 4.
2020-03-14 14:03:44 -05:00
RednedEpic 6eac178305 Merge branch 'master' into inventory 2020-03-10 18:46:27 -05:00
Tim203 37d377b483
Floodgate now uses identity instead of xuid 2020-03-09 21:32:19 +01:00
RednedEpic b2d611e24c Fix some problems brought from merge conflicts 2020-03-05 20:53:58 -06:00
RednedEpic 418026dbe6 Merge branch 'block-entities' into inventory 2020-03-05 20:00:14 -06:00
AJ Ferguson eaf45ff6f7 Fix chunk view position bugs on some servers 2020-03-05 16:26:36 -09:00
RednedEpic 6b22bcec2b Merge branch 'master' into inventory 2020-03-04 21:35:20 -06:00
RednedEpic 1670c77672 Only allow console to shut down Geyser with a command 2020-03-04 20:44:42 -06:00
RednedEpic 2bdf3d4d7f Merge branch 'master' into plugin 2020-02-26 19:31:19 -06:00
AJ Ferguson bc3992f775 Merge remote-tracking branch 'remotes/upstream/master' into inventory
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
#	connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ChestInventoryUpdater.java
2020-02-25 22:12:39 -09:00
RednedEpic f5bc328737 Merge branch 'master' into feature/new-protocol-lib 2020-02-25 18:54:31 -06:00
RednedEpic 41a24ca6ab Merge branch 'master' into plugin 2020-02-16 13:25:37 -06:00
RednedEpic 9ffec0021c Fix movement bugs *and* allow for teleportation 2020-02-16 12:40:54 -06:00
RednedEpic 4bb34cdcce Merge branch 'master' into feature/new-protocol-lib 2020-02-14 17:57:28 -06:00
RednedEpic 4186715083 Update to NukkitX Protocol Lib 2.5.0 release 2020-02-14 17:39:26 -06:00
AJ Ferguson b1a0ed3e91 Merge remote-tracking branch 'remotes/upstream/master' into inventory
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
2020-02-12 21:58:09 -09:00
AJ Ferguson 7f194b2d54 Increase render distance instead of chunkpublisher radius 2020-02-11 13:42:02 -09: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
SupremeMortal f9cd88eaa2
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/direct-block-mapping
 Conflicts:
	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
2020-02-09 22:53:57 +00:00
AJ Ferguson e4ab4b336c Chunk fixes 2020-02-05 19:32:33 -09:00
AJ Ferguson 13f198845c Fix bugs when rapidly switching dimensions 2020-02-05 19:21:09 -09:00
OnlyBMan 0bb18d26b0 Load biome definitions only once instead of everytime a new player joins 2020-02-05 22:02:23 -05:00
OnlyBMan 4dff067faa Add biomes 2020-02-05 21:10:34 -05:00
RednedEpic 0cf574ddcb Merge branch 'master' into feature/direct-block-mapping 2020-02-05 18:59:20 -06:00
RednedEpic 4f461bf374 Start on converting to the new NukkitX protocol library updates 2020-02-05 18:55:34 -06:00
AJ Ferguson 5e5aeed578 Merge remote-tracking branch 'remotes/upstream/master' into inventory 2020-01-30 12:08:39 -09:00
RednedEpic 240f41ff03 Use Path instead of File for floodgate key file in config
...and fix related issues with the file not being found.
2020-01-26 11:22:21 -06:00
RednedEpic cc3cf70257 Search for key in Geyser plugin folder in plugin versions 2020-01-25 22:59:00 -06:00
RednedEpic 6bb478bda4 Merge branch 'master' into block-entities 2020-01-19 22:35:33 -06: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
AJ Ferguson 66f5ed9495 Merge remote-tracking branch 'remotes/upstream/master' into inventory
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
#	connector/src/main/java/org/geysermc/connector/network/translators/java/JavaRespawnTranslator.java
2020-01-04 14:39:01 -09:00