mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-16 10:49:10 +00:00
Code Issues Projects Releases Wiki Activity
11,446 Commits 16 Branches 439 Tags
Commit Graph

10188 Commits

Author SHA1 Message Date
Dylan K. Taylor
4794ba236a Revert "resource packs: added new option remove_client_resources, fixed client packs being removed when forcing resource pack download" 
This reverts commit 06ec8b83978fcc52a7964d678a97c73b50a97aa8.

unfortunately, this had some unanticipated side effects, thanks to
idiotic behaviour in the client ... when having optional downloads but
trying to force resources, the client chokes because it thinks the
server is forcing it to apply a pack that it doesn't have. Since
there's no way to detect when this problem occurs in the protocol, the
only option is to revert this.
 2020-01-04 16:04:07 +00:00
Dylan K. Taylor
9232f4509c TimingsHandler: don't bail on redundant attempts to stop non-running timers 
while it would be nice to bail, providing the environment to allow bailing without breaking stuff requires some complex changes that would reduce performance when timings is not running. Considering the limited usefulness of bailing here anyway, and the fact that it just has to be prevented to not have side effects, it doesn't make a whole lot of sense right now.

closes #3261, closes #3269, closes #3254
 2020-01-04 14:44:55 +00:00
Dylan K. Taylor
cef77907c6 Timings: fixed grandparent timers not working correctly, closes #3229 2020-01-04 13:23:04 +00:00
Dylan K. Taylor
06ec8b8397 resource packs: added new option remove_client_resources, fixed client packs being removed when forcing resource pack download 2020-01-04 13:16:47 +00:00
Dylan K. Taylor
cbc6bb29bc Merge commit 'ee08286ecaf76cd11914c5a3e914093b991c32db' 2020-01-04 12:08:47 +00:00
Dylan K. Taylor
aaa81fb346 Merge commit 'a83211f96a64167f4334a83b12bef31b4b7d55d2' 2020-01-04 12:00:57 +00:00
Dylan K. Taylor
9336b963a6 Merge commit '0b3c4ee4964faba76e1880abcf237fe6860f5248' 2020-01-04 12:00:20 +00:00
Dylan K. Taylor
79aa4959b8 Merge commit 'a9081979071ec8ad56d14474cfbc48b5c60fb440' 2020-01-04 11:28:21 +00:00
Dylan K. Taylor
ee08286eca moved git hash detection code to its own unit 2020-01-02 21:01:31 +00:00
Dylan K. Taylor
a83211f96a VersionInfo: add strict_types to stop CS tools screwing with it 2020-01-02 20:05:50 +00:00
Dylan K. Taylor
0b3c4ee496 bootstrap: don't choke on paths that have spaces in them 2019-12-30 11:58:44 +00:00
Dylan K. Taylor
54de518634 bootstrap: fixed incorrect git hash detection when cwd is not the repo root 2019-12-30 09:09:47 +00:00
Dylan K. Taylor
a908197907 Effect: document that duration is expected in ticks 2019-12-29 19:03:32 +00:00
Dylan K. Taylor
dadc5c1b87 3.11.3 is next 2019-12-29 13:11:30 +00:00
Dylan K. Taylor
a37d740111 Release 3.11.2 2019-12-29 13:11:30 +00:00
Dylan K. Taylor
6968a4232e Merge commit 'd83820477fe905a85a4d1fd11bad1dba211f0f4f' 2019-12-25 14:20:38 +00:00
Dylan K. Taylor
0f718ea28b Merge commit '8726604899d1a371567141e0831ed570d3233356' 2019-12-25 14:19:35 +00:00
Dylan K. Taylor
27fa73a4d2 Merge commit '216138a37e52e545abdba5a3600eabbcced867be' 
# Conflicts:
#	resources/vanilla
 2019-12-25 13:53:25 +00:00
Dylan K. Taylor
b6071bff36 Merge commit '911b6feaf927a7dd9f54240d9bf6b0f7684df692' 2019-12-25 13:52:21 +00:00
Dylan K. Taylor
bfc2a9107c Merge commit 'f7d66613df87f5bd3586daf02922af0a64efdce5' 2019-12-25 13:41:31 +00:00
Dylan K. Taylor
d83820477f TimingsHandler: throw on attempt to stop timer that is not running 
I do not think that this bug is in effect in the core code, but I can't be sure.
 2019-12-21 13:17:40 +00:00
Dylan T
8726604899
Merge #3251: Remove usages of empty() 2019-12-19 11:08:08 +00:00
Dylan K. Taylor
9cbe378e8c Timezone: fix possible crash on CentOS 2019-12-18 11:23:24 +00:00
Dylan K. Taylor
494660102e Replace empty() usages with count() 2019-12-18 11:23:24 +00:00
Luke
216138a37e
PlayerAuthInputPacket: Fix assigning variable in static context 2019-12-17 22:04:24 +08:00
Dylan K. Taylor
911b6feaf9 NetworkInventoryAction: remove dead code 
the trading & beacon types need to be checked as well, but I don't have the tools to check that right now.
 2019-12-17 11:17:40 +00:00
Dylan K. Taylor
2cb6990698 Enchantment: don't throw exceptions on out of range IDs 
this function is used for data deserialization, and data may have bad enchantment IDs in it.
 2019-12-14 10:04:51 +00:00
Dylan K. Taylor
f7d66613df CompletedUsingItemPacket: added missing #include, closes #3219 2019-12-13 19:50:40 +00:00
Dylan K. Taylor
f7eea9bebb Merge branch 'stable' 2019-12-13 18:23:01 +00:00
Dylan K. Taylor
7c15fd6b00 Merge commit '9e1f6a24868823ad06edb6a79d0cb391e637bcb8' 2019-12-13 18:21:57 +00:00
Dylan K. Taylor
95c32d26df Explosion: fixed ray trace getting stuck on a block when it encounters an empty subchunk 
this might have caused unexpected behaviour in large caves.
 2019-12-13 18:07:59 +00:00
Dylan K. Taylor
bcc3e20c31 DiskResourceProvider: do not arbitrarily suffix /resources/ 2019-12-13 17:58:53 +00:00
Dylan K. Taylor
9e1f6a2486 protocol: updated particle IDs 2019-12-13 10:52:09 +00:00
Dylan K. Taylor
81620441a4 CompoundTagMetadataProperty: fix unhandled exception when decoding 2019-12-12 20:27:40 +00:00
Dylan K. Taylor
0a4a1f634f Item: fixed possible type violation in jsonDeserialize() 2019-12-12 20:26:26 +00:00
Dylan K. Taylor
771ccbb727 Server: require a DynamicClassLoader instance 2019-12-12 20:13:51 +00:00
Dylan K. Taylor
c36377ea5a Merge branch 'next-minor' 2019-12-12 19:47:12 +00:00
Dylan K. Taylor
870c66d1fe Merge branch 'stable' into next-minor 2019-12-12 18:29:04 +00:00
Dylan K. Taylor
cf73d74bd0 format/anvil: fixed possible type violation on saving chunk 2019-12-12 18:24:21 +00:00
Dylan K. Taylor
37a8d95464 world IO: fixed crashes when garbage data found in tile/entity NBT data 2019-12-12 18:21:23 +00:00
Dylan K. Taylor
9a4b72add5 PlayerInventory: fix type violation when calling equipItem() for non-Player holder 2019-12-12 16:31:22 +00:00
Dylan K. Taylor
919534d978 EnderChest: fixed crash when plugins overwrite tile classes with incompatible ones 
relates to 47a959dace95eafe79212a444e3f865475c6ee8e
 2019-12-12 16:28:30 +00:00
Dylan K. Taylor
cb598155a4 Server: add @return annotation to crashDump() to make phpstan happy 
this is technically a bug in PHPStan, but it's easier to do this than report a bug.
 2019-12-12 16:19:57 +00:00
Dylan K. Taylor
00888fdc55 TranslationContainer::__construct() accepts float and int too (they can be casted to string) 2019-12-12 16:19:04 +00:00
Dylan K. Taylor
77795ae3bc BaseLang::translateString() accepts float and int too (they can be casted to string) 2019-12-12 16:18:11 +00:00
Dylan K. Taylor
f39fc7e525 CompressBatchedTask::__construct() accepts Player[] not string[] 2019-12-12 16:16:48 +00:00
Dylan K. Taylor
77f7595e0e Location::__construct() accepts floats for x,y,z 2019-12-12 16:16:16 +00:00
Dylan K. Taylor
e8d3a25028 Position::__construct() accepts floats for x,y,z 2019-12-12 16:15:49 +00:00
Dylan K. Taylor
1370930ea9 Entity: remove redundant defaults from lastX lastY lastZ, remove nullability 
these fields are never null because they are initialized in the constructor, and they are never written to with null nor ever expected to be null.
 2019-12-12 16:14:30 +00:00
Dylan K. Taylor
6ace4733ce DataPacket: fixed var_dump() buffer bin2hex not working 
in BinaryUtils new versions, BinaryStream->buffer is private.
detected by phpstan level 4
 2019-12-12 15:02:42 +00:00