3b62926721
Merge branch 'release/3.2'
2018-08-25 18:37:27 +01:00
032b20f659
Server: remove premature optimization of findEntity()
2018-08-25 18:37:18 +01:00
4fb1f8dd76
Merge branch 'release/3.2'
2018-08-25 17:49:28 +01:00
fe6d546190
Merge branch 'release/3.1' into release/3.2
2018-08-25 17:49:21 +01:00
c7af1cf785
Merge branch 'release/3.0' into release/3.1
2018-08-25 17:49:14 +01:00
22fcfffa53
PluginsCommand: remove useless private function
2018-08-25 16:09:51 +01:00
7dd53f2397
Replace unnecessary strlen > 0 calls with !== "" checks
2018-08-25 16:07:49 +01:00
298259b473
PluginsCommand: clean up garbage code
2018-08-25 16:05:25 +01:00
c123f2d10b
SimpleCommandMap: clean up error reporting in registerServerAliases()
2018-08-25 15:43:23 +01:00
3e6f70ddf6
Merge branch 'release/3.1' into mcpe-1.6
2018-08-23 18:00:06 +01:00
d6376a236d
Player: assign allowFlight directly instead of using setter
...
fixes #2397
This was changed by a4939b6bf1
without apparent reason. It causes AdventureSettings to be sent too early.
2018-08-22 19:20:21 +01:00
bea634a9b7
Change air tank regeneration to match UA ( #2396 )
2018-08-22 19:10:53 +01:00
286e062086
Merge branch 'release/3.2'
2018-08-22 15:42:00 +01:00
8daf3dc8b4
Merge branch 'release/3.1' into release/3.2
2018-08-22 15:41:52 +01:00
4cc7573a64
Merge branch 'release/3.0' into release/3.1
2018-08-22 15:40:43 +01:00
9d80802e53
Living: fixed some update conditions not being set
2018-08-22 15:40:32 +01:00
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
b5aa80b375
Merge branch 'release/3.2'
2018-08-21 19:54:40 +01:00
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
f830eddd59
Merge branch 'mcpe-1.6' into mcpe-1.6-master
2018-08-21 17:55:48 +01:00
9ca38ba868
Protocol changes for 1.6.0.8 + resource packs "fix"
2018-08-21 17:36:55 +01:00
424c50e1e9
Protocol changes for 1.6.0.5, minus Entity->Actor rename
2018-08-21 17:36:29 +01:00
566f3c6262
AvailableCommandsPacket: stricter decode and handling
2018-08-21 17:14:54 +01:00
0d05dcec08
AvailableCommandsPacket: deal with dynamic enums
...
somehow I missed this, thanks @NiclasOlofsson for pointing it out
2018-08-21 17:14:53 +01:00
986077e03c
Protocol changes for 1.6.0.1
2018-08-21 17:14:53 +01:00
ac8565fc2e
Merge remote-tracking branch 'origin/release/3.2'
2018-08-19 19:54:34 +01:00
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
358d8b7af7
Merge branch 'release/3.2'
2018-08-19 19:52:51 +01:00
c496480d2b
Merge branch 'release/3.1' into release/3.2
2018-08-19 19:52:40 +01:00
6fce2b3349
Merge branch 'release/3.0' into release/3.1
2018-08-19 19:52:30 +01:00
64ed8adefc
Cactus: fixed place/break logic mismatch causing item spewing
2018-08-19 19:52:07 +01:00
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
7c41bfcdf3
Removed Tile numeric runtime IDs, use block hashes instead
...
Tiles are level-local and are not indexed globally like entities. There is pretty much zero point to them having numeric runtime IDs.
2018-08-19 16:37:04 +01:00
92aeab0d00
Merge branch 'release/3.2'
2018-08-19 16:03:04 +01:00
2eda8cfad3
Merge branch 'release/3.1' into release/3.2
2018-08-19 16:01:47 +01:00
91be5aba0c
Merge branch 'release/3.0' into release/3.1
2018-08-19 16:00:25 +01:00
5df601c817
Add @see docs so PhpStorm can see dynamic constructor usages
...
PhpStorm can't see constructor usages when the class name is dynamic. This causes maintenance problems because cross-referencing constructors called like this doesn't show up dynamic calls.
2018-08-19 16:00:15 +01:00
475ec413e5
Removed deprecated ServerCommandEvent and RemoteServerCommandEvent
...
if you get rekt by these changes... USE A RELEASE like we've been telling you for so long!
2018-08-19 14:23:41 +01:00
b629738312
Merge branch 'release/3.2'
2018-08-19 14:06:34 +01:00
21e7b5ea43
TesterPlugin: removed usage of deprecated ServerCommandEvent
2018-08-19 14:05:26 +01:00
8304675af7
Merge branch 'release/3.1' into release/3.2
2018-08-19 13:59:58 +01:00
1a47735d84
Merge branch 'release/3.0' into release/3.1
2018-08-19 13:59:34 +01:00
0cdf4d0c55
Spoon the TesterPlugin into the main repository
...
I am eating my own words this once, because having the tester plugin as a separate repository makes no sense - it is just added barriers to writing proper tests with no actual benefit. Since the tester plugin is specifically intended for CI, it doesn't make sense for it to be in its own module.
2018-08-19 13:58:13 +01:00
e6e28b74b5
Nuke the TesterPlugin submodule
2018-08-19 13:47:43 +01:00
aa55cd9acf
Merge branch 'release/3.2'
2018-08-19 13:01:54 +01:00
ebffff0caa
Added CommandEvent, deprecated (Remote)?ServerCommandEvent ( #2376 )
2018-08-19 12:59:16 +01:00
1177a381c8
Merge branch 'release/3.2'
2018-08-19 11:45:16 +01:00
0dc4bd36e1
Form: change handleResponse() return type to void
...
this returning is counter intuitive and doesn't make any sense without the queuing mechanism. Instead it's simpler to just use Player->sendForm().
2018-08-19 11:44:59 +01:00
3a1f0eca7c
Merge branch 'release/3.2'
2018-08-19 11:23:04 +01:00
9d17c9a09d
Merge branch 'release/3.1' into release/3.2
2018-08-19 11:22:58 +01:00