7676 Commits

Author SHA1 Message Date
Dylan K. Taylor
72d447276b Merge branch 'release/3.2' into release/3.3 2018-08-30 15:46:54 +01:00
Dylan K. Taylor
d5a5209334 Merge branch 'release/3.1' into release/3.2 2018-08-30 15:46:46 +01:00
Dylan K. Taylor
3a85e6cab9 Backport ce5829430563bab5d5808f8b1bb10a12c860bd17 for 3.x line 2018-08-30 15:46:26 +01:00
Dylan K. Taylor
d0aff2ecbd Bump version for 3.3 dev branch 2018-08-30 11:05:58 +01:00
Dylan K. Taylor
bca493a682 3.2.1 is next 2018-08-30 11:04:47 +01:00
Dylan K. Taylor
5b75c5953f Merge branch 'mcpe-1.6-master' 2018-08-29 17:27:59 +01:00
Dylan K. Taylor
b2c0bba86e Merge branch 'release/3.2' into mcpe-1.6-master 2018-08-29 17:27:48 +01:00
Dylan K. Taylor
cf7071de3d 3.2.1 is next 2018-08-29 17:25:31 +01:00
Dylan K. Taylor
ba12dfafd6 Release 3.2.0 2018-08-29 16:28:35 +01:00
Dylan K. Taylor
e09087de26 Fix version numbers 2018-08-29 16:27:01 +01:00
Dylan K. Taylor
888dba704b Merge branch 'mcpe-1.6' into release/3.2 2018-08-29 16:23:53 +01:00
Dylan K. Taylor
17f1bf5512 3.1.6 is next 2018-08-29 16:08:45 +01:00
Dylan K. Taylor
5179bb1d30 Release 3.1.5 2018-08-29 15:57:58 +01:00
Dylan K. Taylor
9b49d09714 LevelProvider: Added methods to get and set rain/lightning level and times 2018-08-28 15:02:45 +01:00
Dylan K. Taylor
66e46e1c07 Level: use chunk records for tile reading in getTileAt()
the previous revision caused a crash when clicking on the bottom of the world due to a block hash being out of bounds.
2018-08-26 18:57:08 +01:00
Dylan K. Taylor
fa77a4fa58 Merge branch 'master' into mcpe-1.6-master 2018-08-26 18:06:18 +01:00
Dylan K. Taylor
e5cda34548 Merge branch 'release/3.1' into mcpe-1.6 2018-08-26 18:05:14 +01:00
Dylan K. Taylor
5d1ec1ad49 Server: remove deprecated parameter from findEntity() 2018-08-25 18:38:10 +01:00
Dylan K. Taylor
3b62926721 Merge branch 'release/3.2' 2018-08-25 18:37:27 +01:00
Dylan K. Taylor
032b20f659 Server: remove premature optimization of findEntity() 2018-08-25 18:37:18 +01:00
Dylan K. Taylor
4fb1f8dd76 Merge branch 'release/3.2' 2018-08-25 17:49:28 +01:00
Dylan K. Taylor
fe6d546190 Merge branch 'release/3.1' into release/3.2 2018-08-25 17:49:21 +01:00
Dylan K. Taylor
c7af1cf785 Merge branch 'release/3.0' into release/3.1 2018-08-25 17:49:14 +01:00
Dylan K. Taylor
22fcfffa53 PluginsCommand: remove useless private function 2018-08-25 16:09:51 +01:00
Dylan K. Taylor
7dd53f2397 Replace unnecessary strlen > 0 calls with !== "" checks 2018-08-25 16:07:49 +01:00
Dylan K. Taylor
298259b473 PluginsCommand: clean up garbage code 2018-08-25 16:05:25 +01:00
Dylan K. Taylor
c123f2d10b SimpleCommandMap: clean up error reporting in registerServerAliases() 2018-08-25 15:43:23 +01:00
Dylan K. Taylor
3e6f70ddf6 Merge branch 'release/3.1' into mcpe-1.6 2018-08-23 18:00:06 +01:00
Dylan K. Taylor
d6376a236d Player: assign allowFlight directly instead of using setter
fixes #2397

This was changed by a4939b6bf11e3da6f3ffc569540fafd8eba84545 without apparent reason. It causes AdventureSettings to be sent too early.
2018-08-22 19:20:21 +01:00
Dylan K. Taylor
bea634a9b7
Change air tank regeneration to match UA (#2396) 2018-08-22 19:10:53 +01:00
Dylan K. Taylor
286e062086 Merge branch 'release/3.2' 2018-08-22 15:42:00 +01:00
Dylan K. Taylor
8daf3dc8b4 Merge branch 'release/3.1' into release/3.2 2018-08-22 15:41:52 +01:00
Dylan K. Taylor
4cc7573a64 Merge branch 'release/3.0' into release/3.1 2018-08-22 15:40:43 +01:00
Dylan K. Taylor
9d80802e53 Living: fixed some update conditions not being set 2018-08-22 15:40:32 +01:00
Dylan K. Taylor
ec1e257e21 Entity: Fixed fire damage not taking effect in the void
this is an absurd bug that nobody would ever otherwise notice, but the problem is that the doOnFireTick() call isn't evaluated if hasUpdate is already true.
2018-08-22 15:36:31 +01:00
Dylan K. Taylor
b5aa80b375 Merge branch 'release/3.2' 2018-08-21 19:54:40 +01:00
Dylan K. Taylor
d419d4308f Add a couple of item constants, register Scute item
leaving out turtle helmet for now because of complications relating to the effect application - I REALLY don't want to tick armour if I can avoid it, due to the performance concerns.
2018-08-21 19:54:24 +01:00
Dylan K. Taylor
f830eddd59 Merge branch 'mcpe-1.6' into mcpe-1.6-master 2018-08-21 17:55:48 +01:00
Dylan K. Taylor
9ca38ba868 Protocol changes for 1.6.0.8 + resource packs "fix" 2018-08-21 17:36:55 +01:00
Dylan K. Taylor
424c50e1e9 Protocol changes for 1.6.0.5, minus Entity->Actor rename 2018-08-21 17:36:29 +01:00
Dylan K. Taylor
566f3c6262 AvailableCommandsPacket: stricter decode and handling 2018-08-21 17:14:54 +01:00
Dylan K. Taylor
0d05dcec08 AvailableCommandsPacket: deal with dynamic enums
somehow I missed this, thanks @NiclasOlofsson for pointing it out
2018-08-21 17:14:53 +01:00
Dylan K. Taylor
986077e03c Protocol changes for 1.6.0.1 2018-08-21 17:14:53 +01:00
Dylan K. Taylor
ac8565fc2e Merge remote-tracking branch 'origin/release/3.2' 2018-08-19 19:54:34 +01:00
Dylan K. Taylor
ddcb2f002a
Tile: Be explicit about not calling Tile::createNBT() (#2388)
A common pitfall developers fall into with this function is that it has to be called from the scope of the tile class you're creating NBT for, but people commonly do Tile::createNBT() directly, which then results in cryptic "Tile is not registered" errors. This now throws a BadMethodCallException instead to be fully clear about this.

In the future this will be removed completely once NBT is no longer required to create a tile, but for now this is a confusing issue that should be dealt with.
2018-08-19 19:54:22 +01:00
Dylan K. Taylor
358d8b7af7 Merge branch 'release/3.2' 2018-08-19 19:52:51 +01:00
Dylan K. Taylor
c496480d2b Merge branch 'release/3.1' into release/3.2 2018-08-19 19:52:40 +01:00
Dylan K. Taylor
6fce2b3349 Merge branch 'release/3.0' into release/3.1 2018-08-19 19:52:30 +01:00
Dylan K. Taylor
64ed8adefc Cactus: fixed place/break logic mismatch causing item spewing 2018-08-19 19:52:07 +01:00
Dylan K. Taylor
848bce193c Chunk: change tile storage hash function to unbind Y coordinate
this isn't strictly needed but it is more scalable in the case of future build height limit lifts.
2018-08-19 16:56:50 +01:00