4526 Commits

Author SHA1 Message Date
Intyre
a7413dac92
Merge branch with fixes for recipes 2015-09-30 18:14:51 +02:00
Intyre
34df516d94
new branch to fix all issues with items and blocks 2015-09-30 18:09:09 +02:00
Intyre
85dc136631
Crafting recipes, and packet fix 2015-09-29 00:45:57 +02:00
Intyre
72e9765ec8
Merge branch 'Stonecutter-Recipes' of git://github.com/willowmaster66/PocketMine-MP into recipes-0.12-fix
Testing pull request.
2015-09-29 00:40:23 +02:00
Shoghi Cervantes
a7e5e33db8 Merge pull request #3507 from alejandroliu/crafting-event
Added Player to CraftItemEvent
2015-09-27 14:05:38 +02:00
Alejandro Liu
6273875a22 Added Player to CraftItemEvent 2015-09-19 23:08:57 +02:00
willowmaster66
0b9ef5b856 Update of the stonecutter recipes
Added the shaped recipes and removed the shapeless ones.
2015-09-18 22:18:14 +02:00
willowmaster66
a3bce67d35 Updating blocks and items
Added new blocks/items and added constants to existing blocks/items for
clearer recipe making.
2015-09-18 22:17:24 +02:00
willowmaster66
cd6afb2020 Merge remote-tracking branch 'PocketMine/mcpe-0.12' into Stonecutter-Recipes 2015-09-18 22:14:34 +02:00
Shoghi Cervantes
86c1198648 Merge pull request #3495 from 0929hitoshi/mcpe-0.12
Changing the return value of getName
2015-09-17 09:47:30 +02:00
0929hitoshi
9665dfd63e Changing the return value of getName 2015-09-16 01:21:07 +09:00
Shoghi Cervantes
ed559fdf98 Fixed not sending UUIDs properly 2015-09-15 12:23:15 +02:00
Shoghi Cervantes
24f8de2cc3 Bad hack, TODO REMOVE, workarounds client bug by sending inventory contents specifically for creative players <-- this commit is full of sadness 2015-09-14 20:25:57 +02:00
Shoghi Cervantes
885fc07e5c Merge pull request #3481 from LouisBHirst/patch-getOnlinePlayers
getOnlinePlayers() only returns the players already connected
2015-09-13 21:01:51 +02:00
LouisBHirst
c7b915639d getOnlinePlayers() only returns the players already connected 2015-09-13 11:43:51 -04:00
Shoghi Cervantes
79aa7583ec Merge pull request #3471 from PEMapModder/patch-7
Update Player.php
2015-09-12 15:16:10 +02:00
PEMapModder
0d6f13cb4f Update Player.php 2015-09-12 20:53:35 +08:00
Shoghi Cervantes
a1a1327415 Removed signed parameter in BinaryStream->getShort() in favor of getSignedShort() 2015-09-12 00:57:09 +02:00
Shoghi Cervantes
16ff2d99b0 Merge remote-tracking branch 'origin/master' into mcpe-0.12 2015-09-11 17:34:11 +02:00
Shoghi Cervantes
cb222601fd Haters gonna hate, also fix misleading interface default parameter 2015-09-11 16:50:57 +02:00
Shoghi Cervantes
8f24306d65 Merge remote-tracking branch 'origin/master' into mcpe-0.12 2015-09-05 18:22:28 +02:00
Shoghi Cervantes
59a775f82c Merge pull request #3448 from willowmaster66/willowmaster66-patch-4
First item in the hotbar is not loaded correctly
2015-09-05 18:19:45 +02:00
Sjoerd
5baa87e9fe First item in the hotbar is not loaded correctly
When you logon the first hotbar item contains the first item of the inventory, but it should contain the previously selected item.
2015-09-04 23:40:19 +02:00
Shoghi Cervantes
bdf5c46793 Merge branch 'master' into mcpe-0.12 2015-08-31 17:51:07 +02:00
Shoghi Cervantes
4bd14e7424 Revert commit that removed useful parameter for plugins that made backwards-incompatible changes
Revert "@PEMapModder Removed redundant parameters for Living::knockBack. Closes #3427."

This reverts commit 9adcc19154e1a448ff5ff894a9ff804f17b066f1.
2015-08-31 17:48:52 +02:00
Shoghi Cervantes
a18826473b Added enderman teleport sound 2015-08-31 17:48:28 +02:00
PEMapModder
9adcc19154
@PEMapModder Removed redundant parameters for Living::knockBack. Closes #3427. 2015-08-31 22:05:49 +09:30
Michael Yoo
66b86c3685 Merge pull request #3423 from willowmaster66/willowmaster66-patch-1
Block cache not cleared with a call to clearcache
2015-08-31 21:43:03 +09:30
Michael Yoo
7d18b92ea1 Merge pull request #3426 from PEMapModder/patch-7
Remove unused parameter in Level::requestChunk
2015-08-30 02:56:26 +09:30
PEMapModder
0348d181d4 Remove unused parameter in Level::requestChunk 2015-08-29 18:03:40 +08:00
Sjoerd
0b9b1738b3 Block cache not cleared with a call to clearcache
While trying to figure out Github and looking for a different bug I found this small bug in the code. The ClearCache function on Level.php did not correctly clear the blockcache.
2015-08-27 10:44:44 +02:00
Shoghi Cervantes
91bda131be Merge pull request #3395 from luca28pet/patch-1
Spelling fix
2015-08-22 23:37:23 +02:00
Luca P.
1a9ec65983 Spelling fix 2015-08-22 15:58:45 +02:00
Shoghi Cervantes
fabb632286 More changes! 2015-08-13 18:02:10 +02:00
Shoghi Cervantes
99df6f8edc Updated language 2015-08-13 09:17:43 +02:00
Shoghi Cervantes
6e2ea63ce1 Merge remote-tracking branch 'origin/master' into mcpe-0.12 2015-08-12 15:00:04 +02:00
Shoghi Cervantes
31ef7721b1 Removed network channels, bumped protocol 2015-08-12 14:59:48 +02:00
Shoghi Cervantes
f1cc8ddde4 Merge pull request #3372 from SuperMarcus/patch-2
Fix wrong id passed to constructer in CookedFish.php
2015-08-11 19:57:33 +02:00
Marcus Zhou
25b9946d9e Fix wrong id passed to constructer in CookedFish.php 2015-08-11 23:06:40 +08:00
Shoghi Cervantes
5a626405e3 Merge pull request #3368 from thebigsmileXD/patch-2
Added sound for opening/closing (FenceGates)
2015-08-11 12:58:34 +02:00
thebigsmileXD
311d8d94dd Added sound for opening/closing (FenceGates)
Added DoorSound on opening/closing FenceGates depending on #3367 @0929hitoshi 's Idea
2015-08-11 12:48:41 +02:00
Shoghi Cervantes
7d0810a5af Merge pull request #3367 from thebigsmileXD/patch-1
Added opening/closing sound
2015-08-11 12:27:18 +02:00
thebigsmileXD
a5efd0bdf8 Added opening sound 2015-08-11 11:52:08 +02:00
Michael Yoo
ff232a9f04 Merge pull request #3332 from PEMapModder/dec
Disallow registration of events without handlerList, fixes #3330
2015-08-11 16:12:59 +09:30
Shoghi Cervantes
8889e687c9 Changed TextPacket 2015-08-10 23:40:14 +02:00
Intyre
0f993f8beb
setDisplayName skin fix 2015-08-10 16:33:27 +02:00
PEMapModder
d5c2702908 Update PluginManager.php 2015-08-10 22:14:11 +08:00
Shoghi Cervantes
62848b914d Fixed String values on NBT parsing 2015-08-10 15:09:23 +02:00
Shoghi Cervantes
0ce343d8ca Fixed escaping values in NBT parser 2015-08-09 13:52:15 +02:00
Shoghi Cervantes
534b988a1c Added basic Nether generator 2015-08-09 00:38:23 +02:00