120 Commits

Author SHA1 Message Date
Dylan K. Taylor
ed757c7207 consolidate some JWT handling into one class 2020-05-06 21:32:22 +01:00
Dylan K. Taylor
acd37b95b8 Merge branch 'next-minor' 2020-05-06 20:41:48 +01:00
Dylan K. Taylor
f9a587d40e imports cleanup 2020-04-28 17:27:38 +01:00
Dylan K. Taylor
163c3855eb Merge branch 'next-minor'
# Conflicts:
#	resources/vanilla
#	src/plugin/PluginBase.php
#	src/plugin/PluginDescription.php
#	src/pocketmine/Player.php
#	src/pocketmine/network/rcon/RCON.php
#	src/pocketmine/network/rcon/RCONInstance.php
#	src/pocketmine/scheduler/AsyncTask.php
#	src/pocketmine/tile/Spawnable.php
#	src/scheduler/AsyncPool.php
#	src/utils/Config.php
#	src/utils/Timezone.php
#	src/utils/UUID.php
#	src/utils/Utils.php
#	src/world/format/io/region/RegionLoader.php
2020-04-19 11:13:41 +01:00
Dylan K. Taylor
fb1126797a Merge branch 'stable' 2020-02-07 18:13:55 +00:00
Dylan K. Taylor
cb16f5c142 Merge commit '260ac47588c76a2e6814cfba46773a990fb8c5da'
# Conflicts:
#	resources/vanilla
#	src/Server.php
#	src/lang/Language.php
#	src/network/mcpe/protocol/AddItemActorPacket.php
#	src/network/mcpe/protocol/AddPlayerPacket.php
#	src/network/mcpe/protocol/SetActorDataPacket.php
#	src/network/mcpe/serializer/NetworkBinaryStream.php
#	src/permission/Permission.php
#	src/pocketmine/block/Leaves.php
#	src/pocketmine/entity/DataPropertyManager.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/item/Banner.php
#	src/pocketmine/item/Item.php
#	src/pocketmine/level/format/io/LevelProvider.php
#	src/pocketmine/level/format/io/LevelProviderManager.php
#	src/pocketmine/network/mcpe/protocol/AddActorPacket.php
#	src/pocketmine/network/mcpe/protocol/LoginPacket.php
#	src/pocketmine/tile/Banner.php
#	src/scheduler/BulkCurlTask.php
#	src/updater/AutoUpdater.php
#	src/utils/Config.php
#	src/utils/Utils.php
#	src/world/generator/Flat.php
#	src/world/generator/Generator.php
2020-01-31 21:07:34 +00:00
Dylan K. Taylor
3a68f5e3d0 Merge commit 'da43ae82fe3b8839a4d153b0365f815cf9859d77'
# Conflicts:
#	resources/vanilla
#	src/utils/Config.php
#	src/utils/Timezone.php
#	src/utils/Utils.php
2020-01-31 20:02:39 +00:00
Dylan K. Taylor
9311437d42 Utils: add some phpstan docs to fix analyse failure
fuck, I wish we had real generics :(
2020-01-30 12:07:14 +00:00
Dylan K. Taylor
5c4487c980 added some callable prototypes for phpstan 2020-01-29 19:56:16 +00:00
Dylan K. Taylor
055b13a6cf strip extra blank lines (php-cs-fixer) 2020-01-22 15:14:10 +00:00
Dylan K. Taylor
67bcc1c0fb phpdoc armageddon for master, pass 1 2020-01-22 11:55:03 +00:00
Dylan K. Taylor
545f04b2c8 Utils: apply phpstan generics to cloneObjectArray() 2020-01-20 17:28:26 +00:00
Dylan K. Taylor
cda1143a79 Merge branch 'stable' 2020-01-09 17:17:42 +00:00
Dylan K. Taylor
4651bcf8c3 master: imports cleanup
it was easier to make an empty merge and re-run php-cs-fixer afterwards.
2019-12-11 23:23:03 +00:00
Dylan K. Taylor
3eea2442a7 move filesystem-related functions to pocketmine\utils\Filesystem 2019-08-25 17:36:50 +01:00
Dylan K. Taylor
135a2f520c add some UTF-8 validation 2019-08-01 19:51:31 +01:00
Dylan K. Taylor
5499ac620c Removed pocketmine subdirectory, map PSR-4 style 2019-07-30 19:14:57 +01:00
Shoghi Cervantes
cbc64462e6 New directory structure. More powerful startup scripts 2014-03-08 04:41:43 +01:00
Shoghi Cervantes
801e924783 Comments 2014-03-06 23:38:46 +01:00
Shoghi Cervantes
993620341a Added Villager class and NPC interface 2014-03-06 23:33:35 +01:00
Shoghi Cervantes
331a26931f It staaaarts! 2014-03-06 20:41:04 +01:00
Shoghi Cervantes
a54d33957e Added multiple comments and info 2014-03-06 18:52:23 +01:00
Shoghi Cervantes
18443c0cd7 Reformatted code 2014-03-06 17:17:45 +01:00
Shoghi Cervantes
2e0d9153b3 used namespacer 2014-03-06 15:15:50 +01:00
Shoghi Cervantes
419f246e68 Added Item namespace 2014-03-06 15:11:46 +01:00
Shoghi Cervantes
c08bf3ef86 Removed code remove comments 2014-03-06 13:16:44 +01:00
Shoghi Cervantes
42ae544d0d Used namespacer tool 2014-03-06 05:47:00 +01:00
Shoghi Cervantes
da4bc302c4 Fixed Utils endianness 2014-03-06 04:10:07 +01:00
Shoghi Cervantes
5ea31b57ce First step to namespaces 2014-03-05 23:43:16 +01:00
Shoghi Cervantes
23b8fc32ff removed DocBlock header for logo 2014-03-05 11:15:47 +01:00
Shoghi Cervantes
a529e7566a Removed not needed network steps, corrected slot methods 2014-03-05 00:54:12 +01:00
Shoghi Cervantes
f1b5f83fd4 Lots of typos fixed, undefined variables, unused code 2014-02-19 01:55:42 +01:00
Shoghi Cervantes
b635a54b13 Oops x2 2014-02-10 20:47:21 +01:00
Shoghi Cervantes
5bdb61117f Merge pull request #1188 from PocketMine/Faster-Network
Merge Faster-Network into master. Added new Networking system, new Event system
2014-02-10 19:07:12 +01:00
Shoghi Cervantes
9ab993c817 Basic event system written 2014-02-10 17:23:35 +01:00
Shoghi Cervantes
7ebaf7e552 Added Android, BSD detection to Utils::getOS() 2014-02-09 04:44:45 +01:00
Shoghi Cervantes
0e1c099906 Added iOS detection to Utils::getOS() 2014-02-09 03:20:09 +01:00
Shoghi Cervantes
296c6904b9 Hide leave messages from non-spawned players 2014-02-08 20:54:50 +01:00
Shoghi Cervantes
61953b5507 Fixed online functions on Android - do not use DNS 2014-02-07 22:56:15 +01:00
Shoghi Cervantes
a5efe15030 Fixed #1173 #486 #466 #483 ignore E_NOTICE unpack() errors 2014-02-06 14:13:37 +01:00
Shoghi Cervantes
7403516aab Added extra machine data to Utils::getUniqueID() 2014-01-30 01:13:58 +01:00
Shoghi Cervantes
09720a59ec Added Utils::getUniqueID(), returns a machine ID and a even more variable machine ID 2014-01-29 17:07:01 +01:00
Shoghi Cervantes
70445bdeba Added timeout to Utils::getOnline(), fixes #1071 [gh#1071] 2014-01-13 03:34:40 +01:00
Shoghi Cervantes
bd0d708274 Fixed Packet of Death 2013-11-26 17:23:45 +01:00
Shoghi Cervantes
a21bb5ab6d Revert "Revert "Roll back""
This reverts commit e1e804ffe35f9e6c6411b8ed6425af3f8e72f608.
2013-08-29 18:52:12 +02:00
Shoghi Cervantes
e1e804ffe3 Revert "Roll back"
This reverts commit 29504c09f263e73492c6ffecea201a81dcf3591d.
2013-08-28 20:55:58 +02:00
Shoghi Cervantes
093b86fa43 Fixed URL 2013-08-27 19:16:11 +02:00
Shoghi Cervantes
36ff8331b7 Updated headers 2013-08-27 18:16:57 +02:00
Shoghi Cervantes
129e099f88 Fixed Entity metadata sending, sheeps on fire 2013-06-07 20:32:38 +02:00
Shoghi Cervantes
dce9b3140a Plant growth & scheduled updates! 2013-06-04 17:23:03 +02:00