90bf94f8f7
Merge branch 'release/3.1' into release/3.2
2018-07-21 09:53:41 +01:00
5e13e2e777
Merge branch 'release/3.0' into release/3.1
2018-07-21 09:53:31 +01:00
1ef6f5d166
ZippedResourcePack: Make manifest parse errors less useless
2018-07-21 09:53:16 +01:00
eccc249009
KillCommand: clean up old shitcode
2018-07-20 19:44:41 +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
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
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
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
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
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
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
40030e9800
added some LevelProviderManager tests
2018-07-17 12:02:08 +01:00
ad1cf38c21
LevelProviderManager: tighten up checks on registering
2018-07-17 12:02:08 +01:00
5d769147ca
LevelProviderManager: make addProvider() throw InvalidArgumentException instead of LevelException
...
LevelException is not useful because it's too generic.
2018-07-17 12:02:08 +01:00
6f00a30ad7
Merge branch 'release/3.0' into release/3.1
2018-07-17 10:12:52 +01:00
b4bf6901e3
Server: remove useless try/catch around Query event firing
...
this doesn't raise any exceptions, and if it causes Errors to be thrown, those are defects that should be fixed. A catch-all is a bad thing.
2018-07-17 10:10:28 +01:00
921f7e8f6a
Level: remove useless check from populateChunk()
...
this is already checked at the top of the function.
2018-07-16 17:36:36 +01:00
71c3c34976
ItemFactory: prepare for handling items with negative IDs
2018-07-16 13:24:12 +01:00
16c253d7a9
Item: allow negative IDs
...
this will be needed in the future for extended blocks support.
2018-07-16 12:46:16 +01:00
7efe767f1f
Merge branch 'release/3.0' into release/3.1
2018-07-16 12:08:22 +01:00
710e1d014d
Entity: fixed 0-length motion vectors being passed to move()
...
this was an interesting bug.
This was discovered by making a projectile's drag 0, making its gravity a factor of its throw force (such that force / gravity = integer value), and then throwing it directly up. At the apex, an error would occur due to trying to do a ray trace with a zero vector.
This also led me to realize that there's an edge case in the current movement system - if an entity's motion reaches 0, it will stop getting movement updates. This can be undesirable when things such as gravity cause motion to become zero when throwing a projectile directly upwards. This will need to be fixed separately.
2018-07-16 12:08:13 +01:00
2e18fe710c
MemoryManager: Shut down idle workers during GC to reclaim memory
...
workers can be a major memory hog, especially if you have lots of them.
2018-07-14 18:07:37 +01:00
165aac1ba3
Merge branch 'release/3.0' into mc-broken-ed-1.5
2018-07-14 16:09:57 +01:00
878dd3b842
Merge branch 'release/3.0' into release/3.1
2018-07-14 16:06:02 +01:00
7fc22d3227
Entity: fixed setNameTagAlwaysVisible()
...
mojang >.<
this doesn't fix the problem of invisibility making nametags hidden though.
2018-07-14 16:05:46 +01:00
478a131aa5
Flat: separate logic of parsing preset and generating base chunk
...
now always generates the base chunk on init, because the generator won't be created unless there is generation to be done.
2018-07-14 11:51:49 +01:00
