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

7899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dylan K. Taylor
bfc372c6fb Merge branch 'release/3.2' 2018-07-21 09:53:50 +01:00
Dylan K. Taylor
90bf94f8f7 Merge branch 'release/3.1' into release/3.2 2018-07-21 09:53:41 +01:00
Dylan K. Taylor
5e13e2e777 Merge branch 'release/3.0' into release/3.1 2018-07-21 09:53:31 +01:00
Dylan K. Taylor
1ef6f5d166 ZippedResourcePack: Make manifest parse errors less useless 2018-07-21 09:53:16 +01:00
Dylan K. Taylor
eccc249009 KillCommand: clean up old shitcode 2018-07-20 19:44:41 +01:00
Dylan K. Taylor
bf4c6e4c2b Merge branch 'release/3.2' 2018-07-20 12:21:56 +01:00
Dylan K. Taylor
522ef042a7 yet another empty merge... this is tiresome 2018-07-20 12:21:49 +01:00
Dylan K. Taylor
4be36914d6 back to dev 2018-07-20 12:21:15 +01:00
Dylan K. Taylor
e3ef1ecb30 another empty merge 2018-07-20 12:20:54 +01:00
Dylan K. Taylor
dbaf7287bc back to dev 2018-07-20 12:20:24 +01:00
Dylan K. Taylor
3640062142 disable dev flag 3.1.1 2018-07-20 12:12:26 +01:00
Dylan K. Taylor
9af70283fd Empty merge 2018-07-20 12:11:58 +01:00
Dylan K. Taylor
b3b240e25b disable dev flag 3.0.8 2018-07-20 12:05:14 +01:00
Dylan K. Taylor
f77ab468e3 Merge branch 'release/3.2' 2018-07-20 11:57:21 +01:00
Dylan K. Taylor
76ee6bc298 Merge branch 'release/3.1' into release/3.2 2018-07-20 11:57:13 +01:00
Dylan K. Taylor
b18872fbc6 Merge branch 'release/3.0' into release/3.1 2018-07-20 11:57:06 +01:00
Dylan K. Taylor
2b30ef1671 Revert "Living: fix knockback condition, take 2" 
This reverts commit 0081e30a896a730f9598353353f6ee258803850e.

The logic introduced by this commit is correct in MC JAVA 1.9+. Unfortunately, nobody likes 1.9+ for combat.
Some testing in MCPE vanilla made it apparent that this logic isn't correct for MCPE. The old logic is correct for pre-1.9 knockback.
 2018-07-20 11:55:10 +01:00
Dylan K. Taylor
424e9f4a49 Merge branch 'release/3.2' 2018-07-20 11:30:46 +01:00
Dylan K. Taylor
04f20c703c Merge branch 'release/3.1' into release/3.2 2018-07-20 11:30:39 +01:00
Dylan K. Taylor
dd8499e202 Merge branch 'release/3.0' into release/3.1 2018-07-20 11:30:27 +01:00
Dylan K. Taylor
124ebf69c5 PlayStatusPacket: default to current protocol if not specified 2018-07-20 11:29:40 +01:00
Dylan K. Taylor
1144620f2b Level: minor de-spaghettification of chunk requesting 
Now the Level tells the player to request chunks on tick, instead of the server doing it.
 2018-07-18 16:49:58 +01:00
Dylan K. Taylor
e57dd3e8ba Merge branch 'release/3.2' 2018-07-18 15:14:41 +01:00
Dylan K. Taylor
efe4b0cd3a Merge branch 'release/3.1' into release/3.2 2018-07-18 15:14:34 +01:00
Dylan K. Taylor
4d1e56069d Merge branch 'release/3.0' into release/3.1 2018-07-18 15:14:27 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
36e197e2a9 Move more session logic out of Player 2018-07-18 12:48:58 +01:00
Dylan K. Taylor
4d1e2d1b3a Rename SourceInterface -> NetworkInterface 
SourceInterface doesn't make sense really...
 2018-07-18 11:03:21 +01:00
Dylan K. Taylor
965f0d670d Improve documentation of SourceInterface and AdvancedSourceInterface 2018-07-18 11:01:16 +01:00
Dylan K. Taylor
bc9a387b0b Fixed merge error 2018-07-17 18:46:27 +01:00
Dylan K. Taylor
df3870a112 Merge branch 'release/3.2' 2018-07-17 18:35:43 +01:00
Dylan K. Taylor
527d8e9374 Merge branch 'release/3.1' into release/3.2 2018-07-17 18:35:16 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
45d30d53cc back to dev 2018-07-17 18:33:36 +01:00
Dylan K. Taylor
cfc8dfa369 disable dev flag 3.1.0 2018-07-17 18:21:02 +01:00
Dylan K. Taylor
93a2f397c6 Merge branch 'mc-broken-ed-1.5' into release/3.1 2018-07-17 18:13:06 +01:00
Dylan K. Taylor
62fc875cdc bump version 2018-07-17 18:12:49 +01:00
Dylan K. Taylor
58b665985e back to dev 2018-07-17 18:09:24 +01:00
Dylan K. Taylor
0f5c48e342 Disable dev flag for release 3.0.7 2018-07-17 16:59:00 +01:00
Dylan K. Taylor
f47d6ee683 Merge branch 'release/3.1' 2018-07-17 16:57:08 +01:00
Dylan K. Taylor
b7f15b6574 Merge branch 'release/3.0' into release/3.1 2018-07-17 16:56:57 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
73afa22f50 Merge branch 'release/3.1' 2018-07-17 14:53:03 +01:00
Dylan K. Taylor
6ab2fa84da added some tests for ItemFactory::fromString() 2018-07-17 14:52:47 +01:00
Dylan K. Taylor
b480c63060 Fixed ItemFactory::fromString() meta handling bug introduced by 71c3c349766e348bf53a1beeefaf9a897bc0a954 2018-07-17 14:46:08 +01:00
Dylan K. Taylor
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
Dylan K. Taylor
89bfc380e3 Merge branch 'release/3.0' into release/3.1 2018-07-17 12:14:33 +01:00
Dylan K. Taylor
94e8623c75 Server: account for default provider being missing 2018-07-17 12:14:26 +01:00
Dylan K. Taylor
ddc118a562 Merge branch 'release/3.1' 2018-07-17 12:02:33 +01:00
Dylan K. Taylor
40030e9800 added some LevelProviderManager tests 2018-07-17 12:02:08 +01:00