08621604cd
PacketPool: remove redundant comment
...
this was added to signify that these were normal, while BatchPacket was a hack. Since this has now been corrected, there's no need for the comment.
2018-07-20 12:36:44 +01:00
cdcafb1e75
PacketPool: Properly deal with varint packet IDs now that BatchPacket is gone
2018-07-20 12:36:44 +01:00
64ecc373be
Split up session base logic and packet handling
...
this will allow for mutable packet handlers which can be used to cleanly implement multi-stage game sessions.
2018-07-20 12:36:44 +01:00
bdd9a7eb52
Kill BatchPacket, clean up batching related things
...
DataPacketSendEvent and DataPacketReceiveEvent will no longer capture BatchPackets
In most places strings are now used instead of DataPackets, to remove limitations on what data can be sent to a network interface
Removed CraftingManager's cyclic dependency on Server
There is a lot more work to do aside from this, but this commit is intended to clean up what is necessary to fix the handling of BatchPacket.
2018-07-20 12:36:44 +01:00
85647c03bf
Move IP/port to NetworkSession
2018-07-20 12:36:43 +01:00
f969f3b77f
Flatten NetworkSession hierarchy in preparation for refactor
2018-07-20 12:36:43 +01:00
bf4c6e4c2b
Merge branch 'release/3.2'
2018-07-20 12:21:56 +01:00
522ef042a7
yet another empty merge... this is tiresome
2018-07-20 12:21:49 +01:00
4be36914d6
back to dev
2018-07-20 12:21:15 +01:00
e3ef1ecb30
another empty merge
2018-07-20 12:20:54 +01:00
dbaf7287bc
back to dev
2018-07-20 12:20:24 +01:00
3640062142
disable dev flag
2018-07-20 12:12:26 +01:00
9af70283fd
Empty merge
2018-07-20 12:11:58 +01:00
b3b240e25b
disable dev flag
2018-07-20 12:05:14 +01:00
f77ab468e3
Merge branch 'release/3.2'
2018-07-20 11:57:21 +01:00
76ee6bc298
Merge branch 'release/3.1' into release/3.2
2018-07-20 11:57:13 +01:00
b18872fbc6
Merge branch 'release/3.0' into release/3.1
2018-07-20 11:57:06 +01:00
2b30ef1671
Revert "Living: fix knockback condition, take 2"
...
This reverts commit 0081e30a89
2018-07-20 11:55:10 +01:00
424e9f4a49
Merge branch 'release/3.2'
2018-07-20 11:30:46 +01:00
04f20c703c
Merge branch 'release/3.1' into release/3.2
2018-07-20 11:30:39 +01:00
dd8499e202
Merge branch 'release/3.0' into release/3.1
2018-07-20 11:30:27 +01:00
124ebf69c5
PlayStatusPacket: default to current protocol if not specified
2018-07-20 11:29:40 +01:00
1144620f2b
Level: minor de-spaghettification of chunk requesting
...
Now the Level tells the player to request chunks on tick, instead of the server doing it.
2018-07-18 16:49:58 +01:00
e57dd3e8ba
Merge branch 'release/3.2'
2018-07-18 15:14:41 +01:00
efe4b0cd3a
Merge branch 'release/3.1' into release/3.2
2018-07-18 15:14:34 +01:00
4d1e56069d
Merge branch 'release/3.0' into release/3.1
2018-07-18 15:14:27 +01:00
4274640845
Player: fixed on-ground state not being updated when walking horizontally
...
it's possible to walk off a tower while flying without moving vertically, and this code previously wouldn't detect that, leaving a gaping hole in the anti-cheat.
2018-07-18 15:14:18 +01:00
36e197e2a9
Move more session logic out of Player
2018-07-18 12:48:58 +01:00
4d1e2d1b3a
Rename SourceInterface -> NetworkInterface
...
SourceInterface doesn't make sense really...
2018-07-18 11:03:21 +01:00
965f0d670d
Improve documentation of SourceInterface and AdvancedSourceInterface
2018-07-18 11:01:16 +01:00
bc9a387b0b
Fixed merge error
2018-07-17 18:46:27 +01:00
df3870a112
Merge branch 'release/3.2'
2018-07-17 18:35:43 +01:00
527d8e9374
Merge branch 'release/3.1' into release/3.2
2018-07-17 18:35:16 +01:00
c1c70a8a98
move up a version
...
pushing this back to 3.2 so that we can make space for MCPE 1.5 line as 3.1.
2018-07-17 18:34:55 +01:00
45d30d53cc
back to dev
2018-07-17 18:33:36 +01:00
cfc8dfa369
disable dev flag
2018-07-17 18:21:02 +01:00
93a2f397c6
Merge branch 'mc-broken-ed-1.5' into release/3.1
2018-07-17 18:13:06 +01:00
62fc875cdc
bump version
2018-07-17 18:12:49 +01:00
58b665985e
back to dev
2018-07-17 18:09:24 +01:00
0f5c48e342
Disable dev flag for release
2018-07-17 16:59:00 +01:00
f47d6ee683
Merge branch 'release/3.1'
2018-07-17 16:57:08 +01:00
b7f15b6574
Merge branch 'release/3.0' into release/3.1
2018-07-17 16:56:57 +01:00
08ad5db05b
Config: remove useless switch cases
...
CNF is the same type as PROPERTIES (it's an alias) so these cases are useless.
2018-07-17 16:56:47 +01:00
73afa22f50
Merge branch 'release/3.1'
2018-07-17 14:53:03 +01:00
6ab2fa84da
added some tests for ItemFactory::fromString()
2018-07-17 14:52:47 +01:00
b480c63060
Fixed ItemFactory::fromString() meta handling bug introduced by 71c3c34976
2018-07-17 14:46:08 +01:00
f6b54f5116
Server: don't create levels inside catch-all
...
Under normal circumstances, none of the boxed code will throw exceptions. Under exceptional circumstances, the caller should know about it. Usually the caller is the server. We don't want to catch unexpected exceptions because those should crash the server and generate a crashdump.
2018-07-17 12:18:46 +01:00
89bfc380e3
Merge branch 'release/3.0' into release/3.1
2018-07-17 12:14:33 +01:00
94e8623c75
Server: account for default provider being missing
2018-07-17 12:14:26 +01:00
ddc118a562
Merge branch 'release/3.1'
2018-07-17 12:02:33 +01:00
