mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-09-14 21:35:07 +00:00
Compare commits
1269 Commits
1.7dev-318
...
3.1.3
Author | SHA1 | Date | |
---|---|---|---|
51a8905fb3 | |||
f954d7c3dc | |||
7ad0aa56b1 | |||
1ff6f8846e | |||
e6f53cc56b | |||
87f458f9bd | |||
5a7e575c3a | |||
20b37d0208 | |||
d6d98183ea | |||
89cf76363f | |||
9ff5c65fb6 | |||
1532b0ef6d | |||
61accee682 | |||
9ece971a2b | |||
5546c88f88 | |||
4c4761d200 | |||
5492495d38 | |||
6bef07db7c | |||
e8c7ae595d | |||
0d9f40873f | |||
f7358cd7e1 | |||
a4aee98cba | |||
a97c7d3132 | |||
808d289610 | |||
4a1ed21e52 | |||
06c035bfe6 | |||
1b053c7928 | |||
c684f99cc4 | |||
8d47a222b4 | |||
695793795e | |||
9f425bbe2b | |||
a4965842d6 | |||
d0339796b4 | |||
5e13e2e777 | |||
1ef6f5d166 | |||
eccc249009 | |||
4be36914d6 | |||
e3ef1ecb30 | |||
dbaf7287bc | |||
3640062142 | |||
9af70283fd | |||
b3b240e25b | |||
b18872fbc6 | |||
2b30ef1671 | |||
dd8499e202 | |||
124ebf69c5 | |||
4d1e56069d | |||
4274640845 | |||
45d30d53cc | |||
cfc8dfa369 | |||
93a2f397c6 | |||
62fc875cdc | |||
58b665985e | |||
0f5c48e342 | |||
08ad5db05b | |||
94e8623c75 | |||
921f7e8f6a | |||
710e1d014d | |||
165aac1ba3 | |||
7fc22d3227 | |||
7bfe487ee5 | |||
d8cf835f92 | |||
65e44364e5 | |||
ebbbc581ca | |||
8aa8280a63 | |||
6a637d9099 | |||
4a5ff32d2e | |||
06b80a9536 | |||
b5dcdea6d8 | |||
b3ffce9729 | |||
ce9f18c6b4 | |||
9610c55b19 | |||
b01b477a2a | |||
2d454ae56f | |||
066c9d4fd4 | |||
23829952c3 | |||
7ee98ff139 | |||
f1cab91ac9 | |||
e0bc9c5e96 | |||
70caa00266 | |||
ee7c838040 | |||
34e9e93210 | |||
5dbb0d177e | |||
58f0ad3e3e | |||
0df3585c81 | |||
697723b551 | |||
5926d80525 | |||
a57ec1b1ba | |||
905259a4e1 | |||
ca6930006c | |||
33eeeb856e | |||
c43ce5c8fa | |||
57cfe9fd43 | |||
d8824e7ee1 | |||
3455d0f3b9 | |||
6b2250cbce | |||
8dae497610 | |||
cade15e2dd | |||
d3e54db146 | |||
0081e30a89 | |||
76174f1920 | |||
dd6b5902a6 | |||
87852f2fe1 | |||
056d24c67d | |||
484d34fe04 | |||
6c6630d845 | |||
a5a236084f | |||
641a5a5e23 | |||
ebacb8525f | |||
579ab5866b | |||
56b04fa0bb | |||
95787c2be9 | |||
7b7be9618c | |||
4a8232d591 | |||
40e5a1aacb | |||
dbda044229 | |||
d2a037de71 | |||
03510333dc | |||
064e9464bc | |||
2d3ce9e8b0 | |||
49f80830a7 | |||
80daaf09b2 | |||
30ad3a1705 | |||
4e7d1a7947 | |||
da6439e3f4 | |||
5f2d4c36c0 | |||
1f9bed275a | |||
77f3ca4d47 | |||
d88368ceb6 | |||
f77a829a52 | |||
f315aca4c3 | |||
9f7f62e9e5 | |||
cc97f76ec9 | |||
3b0aad38cf | |||
a9b7cd1699 | |||
37b65aac91 | |||
ad7787e13b | |||
7b0ce16b12 | |||
0ff6b7b572 | |||
763e20ba4e | |||
4b99285fd6 | |||
03a55d5e9d | |||
fe29b89fd1 | |||
b0780c4d1d | |||
c835c97aba | |||
78eae28a3e | |||
31c187f366 | |||
2e6afa54c2 | |||
e36a6dc8cc | |||
2e9e44ba05 | |||
c9ec6f0a63 | |||
60836ebec9 | |||
3def3cd502 | |||
b5da6b1591 | |||
8a9af7bf2f | |||
8cfd5604cf | |||
f51743765d | |||
0b9ce8a0d4 | |||
c3c360f589 | |||
5a55d434ab | |||
19d2d6b91c | |||
ff2e99ecdc | |||
07a156f5c4 | |||
13fe8ee96d | |||
eb0276d459 | |||
cfb10360ff | |||
05af87e1d4 | |||
b3ea9606c7 | |||
a080a9b75c | |||
137a05c418 | |||
245f5c6bef | |||
3be6665e3d | |||
8704d378d4 | |||
b9718f9e87 | |||
1d1e6966a2 | |||
610b7bd8b0 | |||
17607b8116 | |||
4c98d9d3ad | |||
7d5b3079bc | |||
88d83e0fca | |||
4b221c0601 | |||
e867427f71 | |||
c4c6c58615 | |||
89643ff9af | |||
9657d50aeb | |||
3725bea3e5 | |||
f3a84b332b | |||
f6481eab8f | |||
8e5aca70b4 | |||
85136b7b4a | |||
47742d74c8 | |||
ca54c8d78e | |||
601811f0f8 | |||
aeb551b317 | |||
37b445f210 | |||
d04991feb6 | |||
c327b3d2c4 | |||
af69418a55 | |||
8cd311bcb4 | |||
78ec3937bf | |||
4e3e807741 | |||
8c6161a4f2 | |||
c8a87b14d5 | |||
8fca7cc68d | |||
45f940681a | |||
e3c97d7d5e | |||
172abef2a7 | |||
709abb02e6 | |||
428ca29e4b | |||
f61ad20f6b | |||
3c9af5cd6d | |||
996935e9b2 | |||
3707a41b67 | |||
354b2dc5d1 | |||
0c70b83d81 | |||
083a1e1ff6 | |||
17b58357fb | |||
96a4dbb7d8 | |||
5eec683110 | |||
0bca3cd481 | |||
b54197904d | |||
fb484087a8 | |||
14914781fc | |||
fdd5b7b9c9 | |||
c83c0eb935 | |||
b331f8e1c9 | |||
ee787974f2 | |||
73e56c8a36 | |||
5f7c884255 | |||
2b5e6b790f | |||
1a21041d00 | |||
7b17a83227 | |||
edd150971e | |||
38f4afb17c | |||
9d16863b1a | |||
41a179e6e1 | |||
3a31c531af | |||
e081b7dffa | |||
0233ae1eb6 | |||
dce8ed9dd1 | |||
35eaf38ca1 | |||
1d71f0cf43 | |||
9644766df3 | |||
857f6dd5df | |||
0d177d5219 | |||
fe21f0e916 | |||
4c1d29cdf7 | |||
fa21cd96c5 | |||
a22e5616f6 | |||
b6317fa7ce | |||
b1cb63ebd6 | |||
7b7917939a | |||
6aaaaefd2f | |||
1bb0337420 | |||
b6b0bbde18 | |||
5d07f66d86 | |||
ec28612a12 | |||
6047810113 | |||
d535fe20a3 | |||
515e4aabc4 | |||
f27c6fcf70 | |||
7864a315f6 | |||
02b4eeeb9b | |||
6b4b4e4bb1 | |||
f2b8d6879f | |||
60212cef2f | |||
15270f8329 | |||
05ef13b23a | |||
1b4723d816 | |||
c493d0e6ac | |||
b3043f9552 | |||
18fdbc2834 | |||
a8c766be88 | |||
e20be3eeba | |||
51f43fb375 | |||
132746aa3d | |||
d03f36ebee | |||
7fce48d38c | |||
b7ca045c51 | |||
81957d133d | |||
299e4c8a85 | |||
0a50b8cb9b | |||
6d53350291 | |||
ad61d70eee | |||
353a1d69db | |||
1d8b77f16e | |||
e3d2fa10a5 | |||
ad15ab5b42 | |||
b003295d01 | |||
4f8f334436 | |||
71fdd59c4c | |||
0a9ed059d6 | |||
74c0863905 | |||
87ff1c0382 | |||
2eaba7c936 | |||
3ee6bfca2a | |||
63ab27550a | |||
d612988882 | |||
c9a0c381b1 | |||
982444949c | |||
8cf0fc63d8 | |||
c18ba38b74 | |||
3a1df1d99e | |||
8ccd13319c | |||
c513d355cb | |||
02b53785be | |||
9dd0ee7f05 | |||
595f1f58da | |||
509e8c5f6d | |||
263cd900a8 | |||
164ce76ff5 | |||
fbf760bafe | |||
2c1afe5f2c | |||
b109b457dc | |||
e12e2897bb | |||
8f41384923 | |||
acf29711c2 | |||
1c4dd4f280 | |||
faa88a55e4 | |||
c9ed517063 | |||
28b0f5f86a | |||
e87e2d4e52 | |||
86c27953ec | |||
5552704922 | |||
c7ac5dfd4b | |||
bd9b59f401 | |||
2f03f5f6d5 | |||
f4a26ddfd9 | |||
adb9390b53 | |||
6111ce7df1 | |||
1f73c08762 | |||
2900167ffa | |||
11cc9f19ad | |||
807af2e6fb | |||
f2511983cf | |||
bac649137b | |||
71224f51d5 | |||
6c3fc4af46 | |||
75d13be38e | |||
9bc860f7a8 | |||
66963fbf9a | |||
172c6420c1 | |||
e7fc9227bc | |||
13cd0cdcfd | |||
0bb5e88b5c | |||
389990e0a8 | |||
067aad9546 | |||
b1a7606e82 | |||
febba6e3a6 | |||
d8dc89e7c8 | |||
b75413e3c4 | |||
f08537a1e0 | |||
6643fa5f09 | |||
210e108574 | |||
813437e3ee | |||
24295ce02f | |||
29fd26627e | |||
22b91aaa24 | |||
f757ba1851 | |||
8c1c8f34cc | |||
c285295037 | |||
2034caf71c | |||
89ccac7a8c | |||
f6e71d8296 | |||
b333a0e24c | |||
8312ad709e | |||
63fc04b3dd | |||
34b8557094 | |||
edaef588ab | |||
889222e9c5 | |||
8239c67b1a | |||
ed65e91a3c | |||
619390c5b7 | |||
7e70569ba2 | |||
083ac8a770 | |||
b21572774a | |||
b8523cb304 | |||
6ceb9af749 | |||
bcd197d7bb | |||
3148f692c1 | |||
d8d22efc3b | |||
7b3653f75d | |||
9c5f7128a4 | |||
1e4a97f921 | |||
4d743ade45 | |||
78b5cc993b | |||
5e91c05424 | |||
e7c5d14af3 | |||
126a97b405 | |||
753ed3801d | |||
68ef4b210d | |||
c3822b795c | |||
be0e85dfae | |||
72690ea7f5 | |||
c9bd60123b | |||
05f4262e81 | |||
dd11bcaf11 | |||
b96adda14d | |||
5c66c615bf | |||
2ff2a2de08 | |||
78f8d54f89 | |||
5b6762d0d5 | |||
2a0a2134d1 | |||
e70af362d0 | |||
24aab8365e | |||
0e5504ed3f | |||
83008440c0 | |||
b14dfa9f7e | |||
197102ca3d | |||
f497e43db3 | |||
38c3f00ef7 | |||
396056c636 | |||
dd1dfefd83 | |||
68638f9779 | |||
7565b786e7 | |||
ae0c1c185f | |||
723251e800 | |||
295016cbc1 | |||
8228774ad4 | |||
2a54726905 | |||
8b225fc4ef | |||
a014b44b69 | |||
c7544c1d25 | |||
eb28622823 | |||
68494f1c0d | |||
27ea0d360f | |||
d384df1f2e | |||
fe8102c062 | |||
8b15d85469 | |||
a5ba716232 | |||
db432bb024 | |||
91486a23a5 | |||
d80c471ae1 | |||
b4068dfd2f | |||
3095eb544d | |||
0247dff909 | |||
5368120f13 | |||
2e7db552dc | |||
53c35aaa1d | |||
3293074cfc | |||
d8f4dde5f3 | |||
dfa6cd2b7e | |||
e03d2b23f7 | |||
96a2fd7482 | |||
88c56bcdc8 | |||
2731fc3d0f | |||
a02f178f80 | |||
96d26a77a1 | |||
554fe4d14d | |||
532269a484 | |||
1e2122d854 | |||
c276ef2b7f | |||
5138bdc4bd | |||
a30a157d8c | |||
e565cdeea4 | |||
556a465c05 | |||
280f2b7259 | |||
933b0e8b41 | |||
58279d4cfe | |||
1e21066c1c | |||
76854da7ba | |||
46cbcb0c42 | |||
af9b0b019d | |||
7db8845375 | |||
f47f593555 | |||
691df5c11d | |||
9a1d3aec6b | |||
670a53ba3b | |||
f22ad14c67 | |||
64540f36be | |||
e66b1953de | |||
aa6666872a | |||
646455f6e8 | |||
05a1e61e5b | |||
5f52e00213 | |||
476ac39988 | |||
5f1ae1059e | |||
08d8adae5b | |||
8d988af7db | |||
db5890fddb | |||
5b532fdcf5 | |||
e85fc54037 | |||
7fb237938c | |||
9a5f9c8586 | |||
4b16be7e0b | |||
47faf5a994 | |||
3f31f6d310 | |||
c06c1c7ce0 | |||
a889a0e517 | |||
9ed0d9d36f | |||
3134fa2744 | |||
2660448601 | |||
eb354916d4 | |||
033b44df5a | |||
ef2dd1de92 | |||
5b7b2dd0e2 | |||
3a10df634b | |||
f1aecc3a71 | |||
42d04a4418 | |||
3fe4ebc301 | |||
d97abfaa7b | |||
526f05631e | |||
ebaef89e06 | |||
6ab0cff9d3 | |||
ae31ce1d25 | |||
a1cf5dbd1e | |||
c86132028e | |||
5ce55bd3b0 | |||
c81f178cdb | |||
fc795b80ae | |||
99134de6b6 | |||
1fc388d6de | |||
eba1ca030c | |||
8ce0fab8cc | |||
5ed2d6022c | |||
37d085f793 | |||
69c54de460 | |||
b9d3bd22a3 | |||
d4d57aa9ea | |||
4ce1f228e6 | |||
4b03dbebba | |||
1d5978df98 | |||
5d32587cf7 | |||
d53258c943 | |||
773f760fff | |||
c20b16a0fe | |||
b151cb26a5 | |||
49622cc2a5 | |||
56328f66a7 | |||
f41a731493 | |||
ec332e3e60 | |||
a1090623a2 | |||
8572e9e560 | |||
bc836aaec1 | |||
145a4fad0f | |||
08c48d8145 | |||
81ecb56095 | |||
a6d7365a28 | |||
1f4f8ab3f0 | |||
1420cd1fa5 | |||
30a83544a0 | |||
7e20385bdb | |||
c7e803372c | |||
cf3638ad8d | |||
0dd8fd2651 | |||
c0c684b12e | |||
924334a776 | |||
be7c27f60d | |||
2b37b4a659 | |||
a4c50d3204 | |||
eb9f60f41c | |||
071aa44d29 | |||
25089f5e70 | |||
22dd8faf1d | |||
7354a55af8 | |||
611f5d684b | |||
9a099d3f5d | |||
5eb1ee3416 | |||
e4b6a18404 | |||
364d278714 | |||
c464d39401 | |||
a185b78486 | |||
c19cf22ac5 | |||
d2fb32c28a | |||
49fbbea7bf | |||
1648fff916 | |||
8d645b714f | |||
403e996d2f | |||
73e09392b6 | |||
209e28dfe5 | |||
ac5a91b67e | |||
24c5d7557e | |||
3d89bf5693 | |||
e48ec9fb71 | |||
95606b6e04 | |||
c243daabe1 | |||
357674cb54 | |||
9d5eeb328e | |||
b2ee6b2ca5 | |||
2860e9e8ee | |||
e82073834f | |||
7fcc538a75 | |||
7f6b8ad7c2 | |||
313b224bec | |||
d12b1d3e07 | |||
eeeef8df51 | |||
9c786089f8 | |||
e3cae7364f | |||
d542bbc736 | |||
e88541b269 | |||
fdad965db8 | |||
dd844f7ad3 | |||
596c8a7b4f | |||
9c598d1345 | |||
a2af838b1d | |||
bf97eab98f | |||
a9a55e9558 | |||
95fb1d1602 | |||
fa644edef3 | |||
ddc9dca8b4 | |||
86eee429bb | |||
4f20a504e3 | |||
6a1f8640f6 | |||
8a0414f306 | |||
d478661961 | |||
b8064aa45c | |||
00f596c4f8 | |||
3f7b14bf59 | |||
ba0a256834 | |||
f2f8c235e7 | |||
69b3bb183d | |||
cd35bd6872 | |||
d09a43cfef | |||
40b995a435 | |||
590826b9bd | |||
a5e87484d9 | |||
8a86e0825b | |||
b39bbffdc5 | |||
bd3d2451bc | |||
606407933e | |||
ad09e8c8d0 | |||
486edf0e55 | |||
2ee01eb195 | |||
9098502199 | |||
b130374e46 | |||
31106bc227 | |||
cc1a3d695f | |||
8020780fc5 | |||
2f266a5922 | |||
3827892e48 | |||
e06b78b0ee | |||
74cff89df3 | |||
a9957c3db3 | |||
2e9bf7e93b | |||
dbcc69c2de | |||
cdd3fe81e1 | |||
a8a3eb3866 | |||
83a3c6f614 | |||
8cc6a32a04 | |||
c1a2144f60 | |||
b2491a5874 | |||
2e125168c3 | |||
5059a92b91 | |||
ea5db98d12 | |||
1f77c074e9 | |||
73a5788774 | |||
dc3bf8546e | |||
c7f8796136 | |||
c5336776a5 | |||
b623c4aba1 | |||
49a39fc7bd | |||
2e4519cb36 | |||
2ff3b12376 | |||
9e4bccd8c0 | |||
1c5180b720 | |||
fa6d44ea9e | |||
9d018e8d9e | |||
ae2e1fdd5a | |||
97bfcf6e71 | |||
5457c7a202 | |||
ee28296d60 | |||
06af742bef | |||
6bdf5e15c0 | |||
d4eba3f4b1 | |||
5a89e80873 | |||
28e601bbb9 | |||
7e9f1324a7 | |||
973d5dc251 | |||
533d139385 | |||
6a94c8183c | |||
629a254639 | |||
732b931556 | |||
2dd1878d57 | |||
3104a312b2 | |||
d6d47feda9 | |||
0ba1b58ee0 | |||
ab2df8b11b | |||
eb01dcaf60 | |||
f0535df96d | |||
f903dbfe00 | |||
e0d5c79848 | |||
e024f381c9 | |||
2a09aaf456 | |||
0ad8ea6e92 | |||
bd47852ca4 | |||
2b036b1a5c | |||
e5ec8fa603 | |||
abe5d94d5b | |||
da5febc34a | |||
3de5e132a2 | |||
37e8c8d324 | |||
aa11dbb928 | |||
e7adaef2d2 | |||
6bf9ae0a18 | |||
e7b2dc87d6 | |||
d7a02793fa | |||
6a996611f8 | |||
ad8d67137e | |||
cbbed6a6c1 | |||
99ef3e6576 | |||
eeaf75ac85 | |||
6954bfac4b | |||
f27b62027c | |||
093cb5b39e | |||
3f41628bf3 | |||
a3fa8adf4a | |||
08daf655e5 | |||
61fc090cf2 | |||
ecd830463c | |||
ffe89f5e1b | |||
88a05845c2 | |||
2cabdca3f7 | |||
be1ddb9f5b | |||
7fc3eeab00 | |||
9395dbf9fa | |||
a7396d7ae9 | |||
3b632c2870 | |||
7dd834bca0 | |||
2b6e135c83 | |||
c26e3aa9fa | |||
aeba15c5c6 | |||
4c583ec8ab | |||
af2435f199 | |||
456987e212 | |||
8e6ec04abc | |||
42a7b7fa36 | |||
ce4e0bf69c | |||
dc84484c2b | |||
e7e4645c0b | |||
4e9e285e37 | |||
3962d32ffe | |||
a84aba5517 | |||
0b82d5c8d4 | |||
3aef4c5a09 | |||
6307952ae9 | |||
cacd0f5d8f | |||
f66928c345 | |||
9abfd54cc1 | |||
4a85311c5f | |||
8a4f6eb6c2 | |||
6e7a693355 | |||
b7bd8dc7f1 | |||
b445825467 | |||
98d6aea7fe | |||
b75d121c7e | |||
88bbb03f12 | |||
9478bc281f | |||
7ec886faa2 | |||
610e62e2cd | |||
906442136b | |||
3600542d78 | |||
3b36d46a8f | |||
63fa6a36a9 | |||
e0ed877494 | |||
bab2daf711 | |||
5858025d90 | |||
dbac2abafb | |||
266d1cb935 | |||
ffbb44673f | |||
a84a8ecc14 | |||
687886e70b | |||
bad323f5cc | |||
ca9f700fb0 | |||
c51cc6b2fe | |||
03c66f0f86 | |||
610b041631 | |||
75289b1498 | |||
4eea54780a | |||
e860d32b3a | |||
c4486d9ad7 | |||
8222b16d9a | |||
dcb53b1cbb | |||
a52a2f6d26 | |||
906d7eb176 | |||
bf3f5532ac | |||
07bf1c9e22 | |||
b659a3d39f | |||
68b30108be | |||
f223fb2876 | |||
8bb785b7af | |||
806a2005d7 | |||
c794ced0ad | |||
f993358c5f | |||
1c12be6bf2 | |||
a1d9b8486e | |||
9397356ce4 | |||
e56e363dcc | |||
18b287c3ea | |||
9014eb72e9 | |||
82948726ed | |||
c601816586 | |||
54f7a88fbb | |||
d2d1df0447 | |||
f9b1afe4cf | |||
033cb8bd63 | |||
0ed9fcb641 | |||
efac23d4af | |||
48dc1c38f7 | |||
ffb3e2b47a | |||
ef816c0a52 | |||
3e35bc38e2 | |||
de0741f727 | |||
6fd4b9f1e2 | |||
6c8a1a5b80 | |||
3842ee15cf | |||
6c71b443e8 | |||
4a4900e5e7 | |||
26d4169fea | |||
7d88a8b315 | |||
41592a04b7 | |||
1d4bafb6ff | |||
28996f561f | |||
0658c0851b | |||
0df2064802 | |||
6543d96910 | |||
0bf5ab76fb | |||
8e1394bf53 | |||
6ddbdc9dc1 | |||
2a8be527d7 | |||
aca1422fca | |||
b0d0932ed9 | |||
fd5557861b | |||
1de7c5b114 | |||
2fb580db26 | |||
e5ca22a9a6 | |||
69ddaacc28 | |||
897a31e608 | |||
4943ff9dfc | |||
e36b38939c | |||
ecb3f9aeac | |||
f0696f77ef | |||
6813838754 | |||
65fe19ca71 | |||
a4f5cab12d | |||
29e06e30b2 | |||
3939e2d9dd | |||
2579438b84 | |||
95d42b9907 | |||
2eb6e075ae | |||
8f928915d9 | |||
3af8cf48b2 | |||
21c03670b6 | |||
0c868b16b6 | |||
1e67360048 | |||
3520dafd29 | |||
857b63ba8f | |||
9551e5b8e5 | |||
c7f15a556d | |||
efca9f0450 | |||
d728154e87 | |||
2e1a167bed | |||
6f6e3aaa21 | |||
9c65a2b890 | |||
beb5bf6dda | |||
7a5e5773b7 | |||
f1b0a4f1de | |||
751345c736 | |||
e850f34d76 | |||
8d7c65585c | |||
96f6362117 | |||
66c768d453 | |||
6fe7763db9 | |||
fda97decaa | |||
b3f44562e9 | |||
51350be190 | |||
7f4b5d282e | |||
94feecd44b | |||
45b02d92d4 | |||
fe4b5498e6 | |||
98b36fd73e | |||
07c7048433 | |||
f09cf92197 | |||
98eba11da5 | |||
a6c1e02847 | |||
b04cee12ea | |||
c4966404bb | |||
579c508761 | |||
43959bccb1 | |||
e6bd12dc2f | |||
7daca754b1 | |||
cb90e30bcf | |||
71d11c73f0 | |||
24116ba846 | |||
a0683dbb0f | |||
b6811b643c | |||
4d2549b50a | |||
1fb3274f37 | |||
6772a69c55 | |||
266a253c03 | |||
c62e1abf2f | |||
55f405f5c2 | |||
8fbd0e58f0 | |||
418d099a2e | |||
9d2eb5e911 | |||
b6c1124d50 | |||
03fda936a8 | |||
684fd46d09 | |||
90fc649441 | |||
0410df77aa | |||
0f30467f62 | |||
a84910f04c | |||
3ee225caec | |||
f963dbd10d | |||
debfbf0d93 | |||
5c37d298a6 | |||
3ca162f23f | |||
5f48433c95 | |||
33352638a9 | |||
db52501462 | |||
3a0cbd1cd4 | |||
1bdb68b7da | |||
6ce728169e | |||
06a3c7c478 | |||
70982c145b | |||
417f2d8998 | |||
7339c4ac2f | |||
43a0ede9d2 | |||
c747c7d025 | |||
c9e2e8980f | |||
9a956692de | |||
d30a6b60b7 | |||
41873bb115 | |||
8064152777 | |||
872df446bd | |||
376a615634 | |||
c16c9efdf3 | |||
c3cc6f9880 | |||
1e139743b8 | |||
bde0ba1100 | |||
50f273c041 | |||
db095f9705 | |||
f580f27ec7 | |||
a46029c0f6 | |||
1a615591e2 | |||
d19683b7dd | |||
f17b3b2a3b | |||
a0a2ea01bc | |||
5132ab6cd9 | |||
256bdf2581 | |||
8a3f8b4706 | |||
7264ce43ae | |||
66e475cbb8 | |||
1e896efff9 | |||
4db7a7e57f | |||
54b23968e7 | |||
bcb080e2b9 | |||
e5c58f9b04 | |||
af7aef70db | |||
3ea72a0bf9 | |||
be02fbb352 | |||
a67f7e3930 | |||
965c19375f | |||
63edcb8934 | |||
e7a012d69a | |||
99c55ac889 | |||
f14adf5827 | |||
c64b9ad63a | |||
dda71b06ae | |||
3c4dca7fdb | |||
ddbc5cf960 | |||
1edf69892a | |||
f10c2a2df2 | |||
3bbdc5ab5b | |||
082e3404c3 | |||
547833ae23 | |||
6e1df36188 | |||
329fe7d844 | |||
b7aaf54a6f | |||
6332814a04 | |||
9d4818d360 | |||
36f3accf4b | |||
8d08840ea4 | |||
7f0d0c9d63 | |||
bf55f03a3e | |||
a5c3fbdd7a | |||
a8bf2191b9 | |||
0688a86f57 | |||
2e11e448dd | |||
8bf275cb8b | |||
1896576a24 | |||
8f811c29d7 | |||
3a4f79629c | |||
375243860e | |||
a842a5319f | |||
c2b0f6af22 | |||
6490d99ac2 | |||
e0b063ac85 | |||
12ac2f4ac7 | |||
cc1951c7ba | |||
0e538ee51d | |||
1b4b832c8c | |||
4f8e4f0522 | |||
0ee78d2416 | |||
4c46087ffc | |||
bb3e72ea4b | |||
914e4c9a72 | |||
9fd7312629 | |||
24387d1efe | |||
3853938ef3 | |||
4ec8416f9a | |||
8aff793a4f | |||
d93ded9047 | |||
fbd04b0fe7 | |||
953f45c50f | |||
1822abc862 | |||
92e966686e | |||
3f50f88e2c | |||
532600ab67 | |||
78f8fe602c | |||
e75fbd7fb4 | |||
06f605879a | |||
4c7038f941 | |||
4bd4d42b82 | |||
f5ebfc3418 | |||
4ae278686c | |||
740786c99e | |||
6abf880e44 | |||
853411fa4f | |||
6e30d23254 | |||
717b36a983 | |||
90eed14cd6 | |||
4452e6ac93 | |||
66562f24fb | |||
56f1a6ba37 | |||
8c47a338df | |||
7c6535283e | |||
c669819bbb | |||
50f3231629 | |||
015cde2169 | |||
dc064dfa2e | |||
131a6a4d19 | |||
67a576722c | |||
b9b50dd5dc | |||
da3640357c | |||
0004e7429f | |||
e2e6b7516a | |||
b903161a5d | |||
99fe63b2a3 | |||
dbc180315e | |||
45983acc0d | |||
a02af1053f | |||
7de88b9040 | |||
58327d0514 | |||
db31d13f96 | |||
55d0684565 | |||
7e3cd24444 | |||
2088a43c56 | |||
3beccc47cd | |||
dfc2d1dfe6 | |||
1f1531810d | |||
a5fc77749f | |||
98cb7f2e10 | |||
e58db75396 | |||
a94c669730 | |||
45ee115b67 | |||
44e06f6a32 | |||
2e62c084a4 | |||
a3622dfa9d | |||
7c8a29151c | |||
8a90d159fe | |||
bf4076766e | |||
49dbd8b2c8 | |||
502dd14c67 | |||
74239eec69 | |||
3c936e1be8 | |||
16fd37a039 | |||
1ce961f688 | |||
d80f711d18 | |||
ebd3d207e4 | |||
31f0437c96 | |||
b06ca6eb0b | |||
67a09a9b16 | |||
51cec525ee | |||
a5f4dda918 | |||
e2d66ac96d | |||
d03fdd5f72 | |||
990a48d858 | |||
af68125872 | |||
5a0afa9f88 | |||
c301788864 | |||
472bf1a1ef | |||
1a4b653d07 | |||
d9f0546cb3 | |||
92a1f45175 | |||
0afe20c382 | |||
e94db980d7 | |||
2cb81b5f8d | |||
78cf875080 | |||
878f1bffb9 | |||
98ac6fc7be | |||
88318d740a | |||
d3e5733ea0 | |||
4703715063 | |||
523a7f0999 | |||
256527c953 | |||
b93691a177 | |||
48c5db4296 | |||
c564655f9b | |||
49301b0d74 | |||
8bc733514b | |||
c1a6711514 | |||
f477cfa1bf | |||
1f5f67e087 | |||
74967eed87 | |||
b88ffa3bdf | |||
79fd9b1c96 | |||
ed195e1167 | |||
667a54fd00 | |||
b22b493abb | |||
0badaeb8f4 | |||
c5ac6a7606 | |||
e9951b1b1f | |||
47f94eebd1 | |||
e9e22db1e7 | |||
75e469c380 | |||
686e1c4470 | |||
8d59843020 | |||
580b30b768 | |||
589ca45825 | |||
88ad43971a | |||
1fd9994056 | |||
808227d9a9 | |||
74b074753f | |||
3f854127ca | |||
9da19b5f15 | |||
78d24b9183 | |||
46afb7caf1 | |||
0ee452773d | |||
a39c9e8c8e | |||
32714d4564 | |||
feade9d982 | |||
373f085436 | |||
d2416d335e | |||
a8ad956b29 | |||
00a9ae6c95 | |||
a9df383346 | |||
19dc22d6b3 | |||
2fd61163bf | |||
5640bcb0b8 | |||
ea3c7383fb | |||
7e496afdd1 | |||
3bc3a0bb49 | |||
c75e62b38c | |||
3a80ec4db8 | |||
8abad33048 | |||
a91a4489d4 | |||
96348e0e44 | |||
dd8a772d43 | |||
dc553142c9 | |||
81fe00a0a5 | |||
6facd8b50f | |||
e709e3c653 | |||
eaba105614 | |||
12bbc764ec | |||
bee3c4f5cd | |||
bda40edebe | |||
5178373d8a | |||
28188e5ef4 | |||
7c2dccd2a6 | |||
adabfe78df | |||
0fdceb6736 | |||
ffa9a91a95 | |||
78bb951942 | |||
7508524b7b | |||
db4a8be240 | |||
3fe9963c84 | |||
db8a835a64 | |||
460d540dbc | |||
665130561e | |||
48a7627b96 | |||
235fc4cd2f | |||
e0654b85ba | |||
19315dfd06 | |||
f3ee605cd3 | |||
976d5583cc | |||
6adc813a7f | |||
769f3f75cd | |||
432d90bddd | |||
3a16985d45 | |||
bbbed22467 | |||
2794df34ab | |||
73cd195e76 | |||
0d2b171c2c | |||
aa399a1109 | |||
d4494687d1 | |||
6fe45a69c8 | |||
784ecef805 | |||
41f363d0c1 | |||
827ee5ff33 | |||
a4e955c0a4 | |||
733e61f815 | |||
0621d5c8ea | |||
a2d4baf8b9 | |||
23bc97e098 | |||
14e6e3694d | |||
0e64c3dad8 | |||
99f06c6c18 | |||
3ca9e6ae98 | |||
fd0b07a0aa | |||
6ece799998 | |||
a9c75a882a | |||
4437b67178 | |||
34d2047ac3 | |||
20d2ef9d38 | |||
eab7b93483 | |||
e84ab8fec2 | |||
a66a757f56 | |||
ddb7fd12f2 | |||
6ccb494f8d | |||
2ec7763bd6 | |||
d663887f9c | |||
6ebe3bfbea | |||
4533df17cf | |||
8ae663425f | |||
e95b1d4b00 | |||
8ad02c9a4e | |||
754e088ee8 | |||
451f5d0cd7 | |||
42ed03fd02 | |||
b51ec9e606 | |||
8d07f833fc | |||
372b97ba8f | |||
dea2942062 | |||
3614711a02 | |||
dcdea6a1f4 | |||
b7cd8dbfa9 | |||
1486b5aa71 | |||
f8e6438efe | |||
caf9eaa2da | |||
6db5596b00 | |||
4ed1a39638 | |||
a770e681dc | |||
a342a61037 | |||
91c256f1a9 | |||
93443992be | |||
ea09cc06c7 | |||
67af4d3b65 | |||
4a78bfaa18 | |||
bb6b100443 | |||
8aca373194 | |||
7e490ccdf2 | |||
991d321928 | |||
600d80331a | |||
f79e4237df | |||
6ce9e79cd5 | |||
e88aa385a3 | |||
5303a710ac | |||
dd085b35cc | |||
6ff1088a57 | |||
d1db27016e | |||
c55bc2d7e9 | |||
747477dfcf | |||
48fefae920 | |||
52d0ad8a61 | |||
bddd7e0eee | |||
883898682f | |||
daf457213d | |||
bd2cb85861 | |||
1d651046c9 | |||
1dea25d123 | |||
b6264d188e | |||
2635c85873 | |||
3b85e558ce | |||
d48880e31b | |||
93d60a9beb | |||
a82efc44aa | |||
6daa0135d5 | |||
08092f17e0 | |||
0072af95cb |
6
.github/ISSUE_TEMPLATE.md
vendored
6
.github/ISSUE_TEMPLATE.md
vendored
@ -1,6 +1,6 @@
|
|||||||
### Issue description
|
### Issue description
|
||||||
<!---
|
<!---
|
||||||
THIS ISSUE TRACKER IS FOR BUG REPORTING, NOT FOR HELP & SUPPORT. If you need help, use the links below.
|
THIS ISSUE TRACKER IS FOR BUG REPORTING, NOT FOR HELP & SUPPORT. If you need help, use the links below.
|
||||||
- http://pmmp.readthedocs.io/en/rtfd/ - Documentation
|
- http://pmmp.readthedocs.io/en/rtfd/ - Documentation
|
||||||
- https://forums.pmmp.io - PMMP Forums
|
- https://forums.pmmp.io - PMMP Forums
|
||||||
|
|
||||||
@ -28,7 +28,7 @@ NO support whatsoever will be provided for third-party modified variants of Pock
|
|||||||
|
|
||||||
Note that 32-bit platforms are no longer supported by PocketMine-MP and issues concerning 32-bit platforms will be closed.
|
Note that 32-bit platforms are no longer supported by PocketMine-MP and issues concerning 32-bit platforms will be closed.
|
||||||
-->
|
-->
|
||||||
* PocketMine-MP:
|
* PocketMine-MP: <!-- LATEST IS NOT A VALID VERSION -->
|
||||||
* PHP:
|
* PHP:
|
||||||
* Server OS:
|
* Server OS:
|
||||||
* Game version: PE/Win10 (delete as appropriate)
|
* Game version: PE/Win10 (delete as appropriate)
|
||||||
@ -43,6 +43,6 @@ If the issue is **not** reproducible without plugins:
|
|||||||
|
|
||||||
### Crashdump, backtrace or other files
|
### Crashdump, backtrace or other files
|
||||||
- Do not paste crashdumps into an issue - please use our Crash Archive at https://crash.pmmp.io for submitting crash reports to not spam the issue tracker. Add links to your reports in the Crash Archive here.
|
- Do not paste crashdumps into an issue - please use our Crash Archive at https://crash.pmmp.io for submitting crash reports to not spam the issue tracker. Add links to your reports in the Crash Archive here.
|
||||||
- Please use gist or anything else to add other files and add links here
|
- Please use gist or anything else to add other files and add links here
|
||||||
|
|
||||||
* ...
|
* ...
|
||||||
|
6
.github/PULL_REQUEST_TEMPLATE.md
vendored
6
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -33,4 +33,8 @@ Requires translations:
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
## Tests
|
## Tests
|
||||||
<!-- Attach scripts or actions to test this pull request, as well as the result -->
|
<!--
|
||||||
|
Details should be provided of tests done. Simply saying "tested" or equivalent is not acceptable.
|
||||||
|
|
||||||
|
Attach scripts or actions to test this pull request, as well as the result
|
||||||
|
-->
|
||||||
|
12
.github/support.yml
vendored
Normal file
12
.github/support.yml
vendored
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
# Configuration for support-requests - https://github.com/dessant/support-requests
|
||||||
|
|
||||||
|
# Label used to mark issues as support requests
|
||||||
|
supportLabel: "Support request"
|
||||||
|
# Comment to post on issues marked as support requests. Add a link
|
||||||
|
# to a support page, or set to `false` to disable
|
||||||
|
supportComment: >
|
||||||
|
This issue tracker is not a support forum. Please use the [forums](https://forums.pmmp.io) for support.
|
||||||
|
# Whether to close issues marked as support requests
|
||||||
|
close: true
|
||||||
|
# Whether to lock issues marked as support requests
|
||||||
|
lock: false
|
9
.gitignore
vendored
9
.gitignore
vendored
@ -1,14 +1,16 @@
|
|||||||
players/*
|
players/*
|
||||||
worlds/*
|
worlds/*
|
||||||
|
plugin_data/*
|
||||||
plugins/*
|
plugins/*
|
||||||
bin/*
|
bin*/*
|
||||||
timings/*
|
timings/*
|
||||||
|
crashdumps/*
|
||||||
*.log
|
*.log
|
||||||
*.txt
|
*.txt
|
||||||
*.phar
|
*.phar
|
||||||
server.properties
|
server.properties
|
||||||
/pocketmine.yml
|
/pocketmine.yml
|
||||||
memoryDump_*/*
|
memory_dumps/*
|
||||||
resource_packs/
|
resource_packs/
|
||||||
|
|
||||||
# Common IDEs
|
# Common IDEs
|
||||||
@ -34,3 +36,6 @@ vendor/*
|
|||||||
|
|
||||||
# Travis files
|
# Travis files
|
||||||
test_data/*
|
test_data/*
|
||||||
|
|
||||||
|
# Doxygen
|
||||||
|
Documentation/*
|
||||||
|
10
.gitmodules
vendored
10
.gitmodules
vendored
@ -1,10 +1,3 @@
|
|||||||
[submodule "src/raklib"]
|
|
||||||
path = src/raklib
|
|
||||||
url = https://github.com/pmmp/RakLib.git
|
|
||||||
branch = master
|
|
||||||
[submodule "src/spl"]
|
|
||||||
path = src/spl
|
|
||||||
url = https://github.com/pmmp/PocketMine-SPL.git
|
|
||||||
[submodule "src/pocketmine/lang/locale"]
|
[submodule "src/pocketmine/lang/locale"]
|
||||||
path = src/pocketmine/lang/locale
|
path = src/pocketmine/lang/locale
|
||||||
url = https://github.com/pmmp/PocketMine-Language.git
|
url = https://github.com/pmmp/PocketMine-Language.git
|
||||||
@ -17,3 +10,6 @@
|
|||||||
[submodule "tests/plugins/PocketMine-TesterPlugin"]
|
[submodule "tests/plugins/PocketMine-TesterPlugin"]
|
||||||
path = tests/plugins/PocketMine-TesterPlugin
|
path = tests/plugins/PocketMine-TesterPlugin
|
||||||
url = https://github.com/pmmp/PocketMine-TesterPlugin.git
|
url = https://github.com/pmmp/PocketMine-TesterPlugin.git
|
||||||
|
[submodule "src/pocketmine/resources/vanilla"]
|
||||||
|
path = src/pocketmine/resources/vanilla
|
||||||
|
url = https://github.com/pmmp/BedrockData.git
|
||||||
|
@ -6,9 +6,9 @@ php:
|
|||||||
before_script:
|
before_script:
|
||||||
# - pecl install channel://pecl.php.net/pthreads-3.1.6
|
# - pecl install channel://pecl.php.net/pthreads-3.1.6
|
||||||
- echo | pecl install channel://pecl.php.net/yaml-2.0.2
|
- echo | pecl install channel://pecl.php.net/yaml-2.0.2
|
||||||
- git clone https://github.com/krakjoe/pthreads.git
|
- git clone https://github.com/pmmp/pthreads.git
|
||||||
- cd pthreads
|
- cd pthreads
|
||||||
- git checkout 6c6b15138c923b69cfa46ee05fc2dd45da587287
|
- git checkout c8cfacda84f21032d6014b53e72bf345ac901dac
|
||||||
- phpize
|
- phpize
|
||||||
- ./configure
|
- ./configure
|
||||||
- make
|
- make
|
||||||
@ -18,7 +18,7 @@ before_script:
|
|||||||
- composer install
|
- composer install
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- ./tests/travis.sh
|
- ./tests/travis.sh -t4
|
||||||
|
|
||||||
notifications:
|
notifications:
|
||||||
email: false
|
email: false
|
||||||
|
@ -5,58 +5,48 @@
|
|||||||
|
|
||||||
## Creating an Issue
|
## Creating an Issue
|
||||||
- If you are reporting a bug:
|
- If you are reporting a bug:
|
||||||
- **make sure that you are using the latest supported version** before opening an issue.
|
- **make sure that you are using the latest supported version** before opening an issue.
|
||||||
- **test it on a clean test server, WITHOUT PLUGINS**, to see if the issue still occurs. If not then it may be a plugin issue. Please also indicate the result of such tests.
|
- **test it on a clean test server, WITHOUT PLUGINS**, to see if the issue still occurs. If not then it may be a plugin issue. Please also indicate the result of such tests.
|
||||||
|
- **[Search the issue tracker](https://github.com/pmmp/PocketMine-MP/issues?utf8=%E2%9C%93&q=is%3Aissue)** to check if anyone has already reported it, to avoid needlessly creating duplicate issues. Make sure you also check closed issues, as an issue you think is valid may already have been resolved.
|
||||||
- [Search the issue tracker](https://github.com/pmmp/PocketMine-MP/issues?utf8=%E2%9C%93&q=is%3Aissue) to check if anyone has already reported it, to avoid needlessly creating duplicate issues. Make sure you also check closed issues, as an issue you think is valid may already have been resolved.
|
- **Do not report plugin issues here.** If your issue is related to a plugin, contact the plugin's original author instead.
|
||||||
|
|
||||||
- If your issue is related to a plugin, **do not report here, contact the plugin's original author** instead.
|
|
||||||
|
|
||||||
- **Support requests are not bugs.** Issues such as "How do I do this" are not bugs and will be closed. If you need help, please see [here](README.md#discussion) and do not misuse our issue tracker.
|
- **Support requests are not bugs.** Issues such as "How do I do this" are not bugs and will be closed. If you need help, please see [here](README.md#discussion) and do not misuse our issue tracker.
|
||||||
|
|
||||||
- **No generic titles** such as "Question", "Help", "Crash Report" etc. A good issue report provides a quick summary in the title. If you just got a crash report but you don't understand it, please look for a line starting with `Message`. It summarizes the bug.
|
- **No generic titles** such as "Question", "Help", "Crash Report" etc. A good issue report provides a quick summary in the title. If you just got a crash report but you don't understand it, please look for a line starting with `Message`. It summarizes the bug.
|
||||||
|
- **Provide information in the issue body, not in the title.** No tags like `[BUG]` are allowed in the title, including `[SOLVED]` for solved issues.
|
||||||
- Information must be provided in the issue body, not in the title. No tags like `[BUG]` are allowed in the title, including `[SOLVED]` for solved issues.
|
- **No generic issue reports.** For bugs, it is the issue author's responsibility to provide us an issue that is **trackable, debuggable, reproducible, reported professionally and is an actual bug**.
|
||||||
|
<br>Valid issue reports must include instructions how to reproduce the issue or a crashdump/backtrace (unless the cause of the issue is obvious).
|
||||||
- Similarly, no generic issue reports. For bugs, it is the issue author's responsibility to provide us an issue that is **trackable, debuggable, reproducible, reported professionally and is an actual bug**.
|
<br>**If you do not provide us with a summary or instructions on how to reproduce the issue, it will be treated as spam and will therefore be closed.**
|
||||||
<br><br>Valid issue reports must include instructions how to reproduce the issue or a crashdump/backtrace (unless the cause of the issue is obvious).
|
<br>In simple words, if the issue cannot be properly confirmed to be valid or lacks required information, the issue will be closed until further information is provided.
|
||||||
<br><br>**If you do not provide us with a summary or instructions on how to reproduce the issue, it will be treated as spam and will therefore be closed.**
|
|
||||||
<br><br>In simple words, if the issue cannot be properly confirmed to be valid or lacks required information, the issue will be closed until further information is provided.
|
|
||||||
|
|
||||||
- To express appreciation, objection, confusion or other supported reactions on pull requests, issues or comments on them, use GitHub [reactions](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments) rather than posting an individual comment with an emoji only. This helps keeping the issue/pull request conversation clean and readable.
|
- To express appreciation, objection, confusion or other supported reactions on pull requests, issues or comments on them, use GitHub [reactions](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments) rather than posting an individual comment with an emoji only. This helps keeping the issue/pull request conversation clean and readable.
|
||||||
|
|
||||||
- If your issue is related to the PocketMine-MP website, forums, etc., please [talk to a human directly](README.md#discussion).
|
- If your issue is related to the PocketMine-MP website, forums, etc., please [talk to a human directly](README.md#discussion).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Contributing Code
|
## Contributing
|
||||||
- To contribute code to the repository, [fork it on GitHub](https://github.com/pmmp/PocketMine-MP/fork), create a branch on your fork, and make your changes on your fork. You can then make a [pull request](https://github.com/pmmp/PocketMine-MP/pull/new) to the project to compare your branch to ours and propose your changes to our repository. We use the Pull Request system to allow members of the team to review changes before they are merged.
|
To contribute to the repository, [fork it on GitHub](https://github.com/pmmp/PocketMine-MP/fork), create a branch on your fork, and make your changes on your fork. You can then make a [pull request](https://github.com/pmmp/PocketMine-MP/pull/new) to the project to compare your branch to ours and propose your changes to our repository. We use the Pull Request system to allow members of the team to review changes before they are merged.
|
||||||
|
|
||||||
- By proposing a pull request to the project, you agree to your code being distributed within PocketMine-MP under the [LGPL license](LICENSE).
|
### Licensing
|
||||||
|
By proposing a pull request to the project, you agree to your code being distributed within PocketMine-MP under the [LGPL license](LICENSE).
|
||||||
|
|
||||||
- At PocketMine, **we enforce a very high standard for contributions**. This is because PocketMine-MP and its related projects are used very widely in production. While this might seem like we are being mean at times, **our priority is what is best for PocketMine-MP itself**. We try to ensure that our project's codebase is as clean as possible and ensure that only top-quality material makes it through to PocketMine-MP itself. **If a contribution does not live up to our standards, changes may be requested or the pull request may be closed.**
|
### Contribution standards
|
||||||
|
- **We enforce a very high standard for contributions**. This is because PocketMine-MP and its related projects are used very widely in production. While this might seem like we are being mean at times, **our priority is what is best for PocketMine-MP itself**.
|
||||||
- **Your pull request will be checked and discussed in due time.** Since the team is scattered all around the world, your PR may not receive any attention for some time.
|
We try to ensure that our project's codebase is as clean as possible and ensure that only top-quality material makes it through to PocketMine-MP itself.
|
||||||
|
- **If a contribution does not meet our standards, changes may be requested or the pull request may be closed.**
|
||||||
- **Avoid using GitHub Web Editor**. The web editor lacks most useful GIT features and **should only be used for very minor changes**. It is immediately clear if the web editor has been used, and if so the PR is more likely to be rejected. If you want to make serious contributions, **please learn how to use [GIT version control](https://git-scm.com/)**.
|
|
||||||
|
|
||||||
- **Do not copy-paste code**. There are potential license issues implicit with copy-pasting, and copy-paste usually indicates a lack of understanding of the actual code. Copy-pasted code is obvious a mile off and **any PR like this is likely to be closed**. If you want to use somebody else's code from a Git repository, **use [GIT's cherry-pick feature](https://git-scm.com/docs/git-cherry-pick)** to cherry-pick the commit. **Cherry-picking is the politer way to copy somebody's changes** and retains all the original accreditation, so there is no need for copy-pasted commits with descriptions like `Some code, thanks @exampleperson`.
|
|
||||||
|
|
||||||
- In addition to the above, **make sure you can explain your changes**. If you can't provide a good explanation of changes, your PR may be rejected.
|
|
||||||
|
|
||||||
|
### Pull requests
|
||||||
- **Create a new branch for each pull request.** Do not create a pull request with commits that exist in another pull request.
|
- **Create a new branch for each pull request.** Do not create a pull request with commits that exist in another pull request.
|
||||||
|
|
||||||
- **Code should use the same style as in PocketMine-MP.** See [below](#code-syntax) for an example.
|
|
||||||
|
|
||||||
- **The code must be clear** and written in English, comments included.
|
|
||||||
|
|
||||||
- **Use descriptive commit titles.** You can see an example [here](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
|
- **Use descriptive commit titles.** You can see an example [here](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
|
||||||
|
- **Do not include multiple unrelated changes in one commit.** An atomic style for commits is preferred - this means that changes included in a commit should be part of a single distinct change set. See [this link](https://www.freshconsulting.com/atomic-commits/) for more information on atomic commits. See the [documentation on `git add`](https://git-scm.com/docs/git-add) for information on how to isolate local changes for committing.
|
||||||
- **Try to stick to one change per commit.** This ensures that if you create a PR with several changes, we can decide which ones we wish to include and which ones not to include.
|
- **Your pull request will be checked and discussed in due time.** Since the team is scattered all around the world, your PR may not receive any attention for some time.
|
||||||
|
- **It is inadvisable to create large pull requests with lots of changes** unless this has been discussed with the team beforehand. Large pull requests are difficult to review, and such pull requests may end up being closed. The only exception is when all features in the pull request are related to each other, and share the same core changes.
|
||||||
- **It is inadvisable to create pull requests with large commits** unless this has been discussed with the team beforehand. Large pull requests are difficult to review, and such pull requests may end up being closed. The only exception is when all features in the pull request are related to each other, and share the same core changes.
|
|
||||||
|
|
||||||
- **You may be asked to rebase your pull request** if the branch becomes outdated and/or if possibly conflicting changes are made to the target branch. To see how to do this, read [this page](https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request).
|
- **You may be asked to rebase your pull request** if the branch becomes outdated and/or if possibly conflicting changes are made to the target branch. To see how to do this, read [this page](https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request).
|
||||||
|
- **Details should be provided of tests done.** Simply saying "Tested" or equivalent is not acceptable.
|
||||||
|
|
||||||
|
### Code contributions
|
||||||
|
- **Avoid committing changes directly on GitHub. This includes use of the web editor, and also uploading files.** The web editor lacks most useful GIT features and **should only be used for very minor changes**. It is immediately clear if the web editor has been used, and if so the PR is more likely to be rejected. If you want to make serious contributions, **please learn how to use [GIT version control](https://git-scm.com/)**.
|
||||||
|
- **Do not copy-paste code**. There are potential license issues implicit with copy-pasting, and copy-paste usually indicates a lack of understanding of the actual code. Copy-pasted code is obvious a mile off and **any PR like this is likely to be closed**. If you want to use somebody else's code from a Git repository, **use [GIT's cherry-pick feature](https://git-scm.com/docs/git-cherry-pick)** to cherry-pick the commit. **Cherry-picking is the politer way to copy somebody's changes** and retains all the original accreditation, so there is no need for copy-pasted commits with descriptions like `Some code, thanks @exampleperson`.
|
||||||
|
- **Make sure you can explain your changes**. If you can't provide a good explanation of changes, your PR may be rejected.
|
||||||
|
- **Code should use the same style as in PocketMine-MP.** See [below](#code-syntax) for an example.
|
||||||
|
- **The code must be clear** and written in English, comments included.
|
||||||
|
|
||||||
|
|
||||||
**Thanks for contributing to PocketMine-MP!**
|
**Thanks for contributing to PocketMine-MP!**
|
||||||
@ -78,17 +68,18 @@ It is mainly [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accept
|
|||||||
- Strings SHOULD use the double quote `"` except when the single quote is required.
|
- Strings SHOULD use the double quote `"` except when the single quote is required.
|
||||||
- All code SHOULD have parameter and type declarations where possible.
|
- All code SHOULD have parameter and type declarations where possible.
|
||||||
- Strict types SHOULD be enabled on new files where it is sensible to do so.
|
- Strict types SHOULD be enabled on new files where it is sensible to do so.
|
||||||
|
- All constant declarations SHOULD be preceded by a visibility modifier.
|
||||||
|
|
||||||
```php
|
```php
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
declare(strict_types = 1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace pocketmine\example;
|
namespace pocketmine\example;
|
||||||
|
|
||||||
class ExampleClass{
|
class ExampleClass{
|
||||||
|
|
||||||
const EXAMPLE_CLASS_CONSTANT = 1;
|
public const EXAMPLE_CLASS_CONSTANT = 1;
|
||||||
|
|
||||||
public $examplePublicVariable = "defaultValue";
|
public $examplePublicVariable = "defaultValue";
|
||||||
private $examplePrivateVariable;
|
private $examplePrivateVariable;
|
||||||
@ -99,7 +90,7 @@ class ExampleClass{
|
|||||||
* @param string $firstArgument the first argument
|
* @param string $firstArgument the first argument
|
||||||
* @param string|null $secondArgument default null
|
* @param string|null $secondArgument default null
|
||||||
*/
|
*/
|
||||||
public function __construct(string $firstArgument, &$secondArgument = null){
|
public function __construct(string $firstArgument, ?string &$secondArgument = null){
|
||||||
if($firstArgument === "exampleValue"){ //Remember to use === instead of == when possible
|
if($firstArgument === "exampleValue"){ //Remember to use === instead of == when possible
|
||||||
//do things
|
//do things
|
||||||
}elseif($firstArgument === "otherValue"){
|
}elseif($firstArgument === "otherValue"){
|
||||||
@ -119,7 +110,6 @@ class ExampleClass{
|
|||||||
public function doStuff(string $stuff) : string{
|
public function doStuff(string $stuff) : string{
|
||||||
return $stuff;
|
return $stuff;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
@ -133,4 +123,4 @@ class ExampleClass{
|
|||||||
* After voting has been closed, no further votes will be counted.
|
* After voting has been closed, no further votes will be counted.
|
||||||
* An RFC will be rejected if less than 50% + 1 (simple majority) has voted Yes.
|
* An RFC will be rejected if less than 50% + 1 (simple majority) has voted Yes.
|
||||||
* If the RFC is approved, Team Members have the final word on its implementation or rejection.
|
* If the RFC is approved, Team Members have the final word on its implementation or rejection.
|
||||||
* RFCs with complex voting options will specify the vote percentage or other details.
|
* RFCs with complex voting options will specify the vote percentage or other details.
|
||||||
|
18
README.md
18
README.md
@ -1,6 +1,6 @@
|
|||||||
# [](https://pmmp.io)
|
# [](https://pmmp.io)
|
||||||
|
|
||||||
__A highly customisable, open source server software for Minecraft: Pocket Edition written in PHP__
|
__A highly customisable, open source server software for Minecraft: Bedrock Edition written in PHP__
|
||||||
|
|
||||||
[](https://travis-ci.org/pmmp/PocketMine-MP)
|
[](https://travis-ci.org/pmmp/PocketMine-MP)
|
||||||
|
|
||||||
@ -10,7 +10,6 @@ If you don't find what you're looking for there, [talk to a human](#discussion).
|
|||||||
|
|
||||||
### Discussion
|
### Discussion
|
||||||
- [Forums](https://forums.pmmp.io/)
|
- [Forums](https://forums.pmmp.io/)
|
||||||
- [#pmmp + #pocketmine channel IRC](http://webchat.freenode.net/?channels=pmmp,pocketmine)
|
|
||||||
|
|
||||||
### Plugins
|
### Plugins
|
||||||
There are a very wide range of already-written plugins available which you can use to customise your server. Check out [Poggit](https://poggit.pmmp.io), or just search GitHub.
|
There are a very wide range of already-written plugins available which you can use to customise your server. Check out [Poggit](https://poggit.pmmp.io), or just search GitHub.
|
||||||
@ -23,19 +22,10 @@ There are a very wide range of already-written plugins available which you can u
|
|||||||
Yes you can! Contributions are welcomed provided that they comply with our [Contributing Guidelines](CONTRIBUTING.md). Please ensure you read the relevant sections of the guidelines carefully before making a Pull Request or opening an Issue.
|
Yes you can! Contributions are welcomed provided that they comply with our [Contributing Guidelines](CONTRIBUTING.md). Please ensure you read the relevant sections of the guidelines carefully before making a Pull Request or opening an Issue.
|
||||||
|
|
||||||
### Where can I get the latest .phar?
|
### Where can I get the latest .phar?
|
||||||
Head over to our [official Jenkins server](https://jenkins.pmmp.io/)
|
- Latest release builds can be found in our [GitHub releases](https://github.com/pmmp/PocketMine-MP/releases).
|
||||||
|
- Latest bleeding-edge development builds (and other builds in the build job channels) can be found on our [Jenkins server](https://jenkins.pmmp.io/).
|
||||||
|
|
||||||
## Third-party Libraries/Protocols Used
|
**Note: Please avoid development builds unless there is no other alternative for what you need.** Development builds are subject to changes at any time without notice, and it is likely that your server or plugins might break without warning.
|
||||||
* __[PHP Sockets](http://php.net/manual/en/book.sockets.php)__
|
|
||||||
* __[PHP mbstring](http://php.net/manual/en/book.mbstring.php)__
|
|
||||||
* __[PHP BCMath](http://php.net/manual/en/book.bc.php)__
|
|
||||||
* __[PHP pthreads](http://pthreads.org/)__ by _[krakjoe](https://github.com/krakjoe)_: Threading for PHP - Share Nothing, Do Everything.
|
|
||||||
* __[PHP YAML](https://code.google.com/p/php-yaml/)__ by _Bryan Davis_: The Yaml PHP Extension provides a wrapper to the LibYAML library.
|
|
||||||
* __[LibYAML](http://pyyaml.org/wiki/LibYAML)__ by _Kirill Simonov_: A YAML 1.1 parser and emitter written in C.
|
|
||||||
* __[cURL](http://curl.haxx.se/)__: cURL is a command line tool for transferring data with URL syntax
|
|
||||||
* __[Zlib](http://www.zlib.net/)__: A Massively Spiffy Yet Delicately Unobtrusive Compression Library
|
|
||||||
* __[Source RCON Protocol](https://developer.valvesoftware.com/wiki/Source_RCON_Protocol)__
|
|
||||||
* __[UT3 Query Protocol](http://wiki.unrealadmin.org/UT3_query_protocol)__
|
|
||||||
|
|
||||||
## Licensing information
|
## Licensing information
|
||||||
|
|
||||||
|
@ -1,13 +1,16 @@
|
|||||||
{
|
{
|
||||||
"name": "pmmp/pocketmine-mp",
|
"name": "pocketmine/pocketmine-mp",
|
||||||
"description": "A server software for Minecraft: Pocket Edition written in PHP",
|
"description": "A server software for Minecraft: Pocket Edition written in PHP",
|
||||||
"type": "project",
|
"type": "project",
|
||||||
"homepage": "https://pmmp.io",
|
"homepage": "https://pmmp.io",
|
||||||
"license": "LGPL-3.0",
|
"license": "LGPL-3.0",
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=7.2",
|
"php": ">=7.2.0",
|
||||||
|
"php-64bit": "*",
|
||||||
"ext-bcmath": "*",
|
"ext-bcmath": "*",
|
||||||
"ext-curl": "*",
|
"ext-curl": "*",
|
||||||
|
"ext-ctype": "*",
|
||||||
|
"ext-date": "*",
|
||||||
"ext-hash": "*",
|
"ext-hash": "*",
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"ext-mbstring": "*",
|
"ext-mbstring": "*",
|
||||||
@ -20,14 +23,48 @@
|
|||||||
"ext-spl": "*",
|
"ext-spl": "*",
|
||||||
"ext-yaml": ">=2.0.0",
|
"ext-yaml": ">=2.0.0",
|
||||||
"ext-zip": "*",
|
"ext-zip": "*",
|
||||||
"ext-zlib": ">=1.2.11"
|
"ext-zlib": ">=1.2.11",
|
||||||
|
"pocketmine/raklib": "^0.12.0",
|
||||||
|
"pocketmine/spl": "^0.3.0",
|
||||||
|
"pocketmine/binaryutils": "^0.1.0",
|
||||||
|
"pocketmine/nbt": "^0.2.0",
|
||||||
|
"pocketmine/math": "^0.2.0",
|
||||||
|
"pocketmine/snooze": "^0.1.0"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"exclude-from-classmap": [
|
"psr-4": {
|
||||||
"src/spl/stubs"
|
"": ["src"]
|
||||||
],
|
|
||||||
"psr-0": {
|
|
||||||
"": ["src", "src/spl"]
|
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
"autoload-dev": {
|
||||||
|
"psr-4": {
|
||||||
|
"pocketmine\\": "tests/phpunit/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"repositories": [
|
||||||
|
{
|
||||||
|
"type": "vcs",
|
||||||
|
"url": "https://github.com/pmmp/RakLib"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "vcs",
|
||||||
|
"url": "https://github.com/pmmp/SPL"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "vcs",
|
||||||
|
"url": "https://github.com/pmmp/BinaryUtils"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "vcs",
|
||||||
|
"url": "https://github.com/pmmp/NBT"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "vcs",
|
||||||
|
"url": "https://github.com/pmmp/Math"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "vcs",
|
||||||
|
"url": "https://github.com/pmmp/Snooze"
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
227
composer.lock
generated
227
composer.lock
generated
@ -1,11 +1,227 @@
|
|||||||
{
|
{
|
||||||
"_readme": [
|
"_readme": [
|
||||||
"This file locks the dependencies of your project to a known state",
|
"This file locks the dependencies of your project to a known state",
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "d4fecad9dce5314493052c870c8cf059",
|
"content-hash": "2670b9e2a730ff758909be8b9e9d609a",
|
||||||
"packages": [],
|
"packages": [
|
||||||
|
{
|
||||||
|
"name": "pocketmine/binaryutils",
|
||||||
|
"version": "0.1.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/pmmp/BinaryUtils.git",
|
||||||
|
"reference": "c824ac67eeeb6899c2a9ec91a769eb9ed6e3f595"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/c824ac67eeeb6899c2a9ec91a769eb9ed6e3f595",
|
||||||
|
"reference": "c824ac67eeeb6899c2a9ec91a769eb9ed6e3f595",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=7.2",
|
||||||
|
"php-64bit": "*"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"pocketmine\\utils\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"license": [
|
||||||
|
"LGPL-3.0"
|
||||||
|
],
|
||||||
|
"description": "Classes and methods for conveniently handling binary data",
|
||||||
|
"support": {
|
||||||
|
"source": "https://github.com/pmmp/BinaryUtils/tree/master",
|
||||||
|
"issues": "https://github.com/pmmp/BinaryUtils/issues"
|
||||||
|
},
|
||||||
|
"time": "2018-04-16T09:05:08+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pocketmine/math",
|
||||||
|
"version": "0.2.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/pmmp/Math.git",
|
||||||
|
"reference": "95ae5600328ed2add44c0bc830a68d3660e9e0ef"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/pmmp/Math/zipball/95ae5600328ed2add44c0bc830a68d3660e9e0ef",
|
||||||
|
"reference": "95ae5600328ed2add44c0bc830a68d3660e9e0ef",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=7.2.0",
|
||||||
|
"php-64bit": "*"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"pocketmine\\math\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"license": [
|
||||||
|
"LGPL-3.0"
|
||||||
|
],
|
||||||
|
"description": "PHP library containing math related code used in PocketMine-MP",
|
||||||
|
"support": {
|
||||||
|
"source": "https://github.com/pmmp/Math/tree/master",
|
||||||
|
"issues": "https://github.com/pmmp/Math/issues"
|
||||||
|
},
|
||||||
|
"time": "2018-06-09T09:26:30+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pocketmine/nbt",
|
||||||
|
"version": "0.2.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/pmmp/NBT.git",
|
||||||
|
"reference": "da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/pmmp/NBT/zipball/da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c",
|
||||||
|
"reference": "da19487ff92f6f7a16b5ce8894132bb1d1e9ea0c",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=7.2.0",
|
||||||
|
"php-64bit": "*",
|
||||||
|
"pocketmine/binaryutils": "^0.1.0"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"pocketmine\\nbt\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload-dev": {
|
||||||
|
"psr-4": {
|
||||||
|
"pocketmine\\nbt\\": "tests/phpunit/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"license": [
|
||||||
|
"LGPL-3.0"
|
||||||
|
],
|
||||||
|
"description": "PHP library for working with Named Binary Tags",
|
||||||
|
"support": {
|
||||||
|
"source": "https://github.com/pmmp/NBT/tree/0.2.0",
|
||||||
|
"issues": "https://github.com/pmmp/NBT/issues"
|
||||||
|
},
|
||||||
|
"time": "2018-06-13T09:56:00+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pocketmine/raklib",
|
||||||
|
"version": "0.12.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/pmmp/RakLib.git",
|
||||||
|
"reference": "922da28efd828e2af6c19db1676ea9b6a267071c"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/pmmp/RakLib/zipball/922da28efd828e2af6c19db1676ea9b6a267071c",
|
||||||
|
"reference": "922da28efd828e2af6c19db1676ea9b6a267071c",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-bcmath": "*",
|
||||||
|
"ext-pthreads": ">=3.1.7dev",
|
||||||
|
"ext-sockets": "*",
|
||||||
|
"php": ">=7.2.0",
|
||||||
|
"php-64bit": "*",
|
||||||
|
"php-ipv6": "*",
|
||||||
|
"pocketmine/binaryutils": "^0.1.0",
|
||||||
|
"pocketmine/snooze": "^0.1.0",
|
||||||
|
"pocketmine/spl": "^0.3.0"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"raklib\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"license": [
|
||||||
|
"GPL-3.0"
|
||||||
|
],
|
||||||
|
"description": "A RakNet server implementation written in PHP",
|
||||||
|
"support": {
|
||||||
|
"source": "https://github.com/pmmp/RakLib/tree/0.12.0",
|
||||||
|
"issues": "https://github.com/pmmp/RakLib/issues"
|
||||||
|
},
|
||||||
|
"time": "2018-06-13T10:06:14+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pocketmine/snooze",
|
||||||
|
"version": "0.1.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/pmmp/Snooze.git",
|
||||||
|
"reference": "3cc9d0164230889acb08e22cc126133809e9d346"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/pmmp/Snooze/zipball/3cc9d0164230889acb08e22cc126133809e9d346",
|
||||||
|
"reference": "3cc9d0164230889acb08e22cc126133809e9d346",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-pthreads": ">=3.1.7dev",
|
||||||
|
"php-64bit": ">=7.2.0"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"pocketmine\\snooze\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"license": [
|
||||||
|
"LGPL-3.0"
|
||||||
|
],
|
||||||
|
"description": "Thread notification management library for code using the pthreads extension",
|
||||||
|
"support": {
|
||||||
|
"source": "https://github.com/pmmp/Snooze/tree/0.1.0",
|
||||||
|
"issues": "https://github.com/pmmp/Snooze/issues"
|
||||||
|
},
|
||||||
|
"time": "2018-06-13T09:36:11+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pocketmine/spl",
|
||||||
|
"version": "0.3.1",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/pmmp/SPL.git",
|
||||||
|
"reference": "ca3912099543ddc4b4b14f40e258d84ca547dfa5"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/pmmp/SPL/zipball/ca3912099543ddc4b4b14f40e258d84ca547dfa5",
|
||||||
|
"reference": "ca3912099543ddc4b4b14f40e258d84ca547dfa5",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"exclude-from-classmap": [
|
||||||
|
"stubs"
|
||||||
|
],
|
||||||
|
"classmap": [
|
||||||
|
"./"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"license": [
|
||||||
|
"LGPL-3.0"
|
||||||
|
],
|
||||||
|
"description": "Standard library files required by PocketMine-MP and related projects",
|
||||||
|
"support": {
|
||||||
|
"source": "https://github.com/pmmp/SPL/tree/master"
|
||||||
|
},
|
||||||
|
"time": "2018-06-09T17:30:36+00:00"
|
||||||
|
}
|
||||||
|
],
|
||||||
"packages-dev": [],
|
"packages-dev": [],
|
||||||
"aliases": [],
|
"aliases": [],
|
||||||
"minimum-stability": "stable",
|
"minimum-stability": "stable",
|
||||||
@ -15,9 +231,12 @@
|
|||||||
"prefer-stable": false,
|
"prefer-stable": false,
|
||||||
"prefer-lowest": false,
|
"prefer-lowest": false,
|
||||||
"platform": {
|
"platform": {
|
||||||
"php": ">=7.2",
|
"php": ">=7.2.0",
|
||||||
|
"php-64bit": "*",
|
||||||
"ext-bcmath": "*",
|
"ext-bcmath": "*",
|
||||||
"ext-curl": "*",
|
"ext-curl": "*",
|
||||||
|
"ext-ctype": "*",
|
||||||
|
"ext-date": "*",
|
||||||
"ext-hash": "*",
|
"ext-hash": "*",
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"ext-mbstring": "*",
|
"ext-mbstring": "*",
|
||||||
|
2321
doxygen.conf
Normal file
2321
doxygen.conf
Normal file
File diff suppressed because it is too large
Load Diff
@ -23,7 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine;
|
namespace pocketmine;
|
||||||
|
|
||||||
use pocketmine\event\TranslationContainer;
|
use pocketmine\lang\TranslationContainer;
|
||||||
use pocketmine\utils\TextFormat;
|
use pocketmine\utils\TextFormat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -116,7 +116,7 @@ abstract class Achievement{
|
|||||||
public static function broadcast(Player $player, string $achievementId) : bool{
|
public static function broadcast(Player $player, string $achievementId) : bool{
|
||||||
if(isset(Achievement::$list[$achievementId])){
|
if(isset(Achievement::$list[$achievementId])){
|
||||||
$translation = new TranslationContainer("chat.type.achievement", [$player->getDisplayName(), TextFormat::GREEN . Achievement::$list[$achievementId]["name"] . TextFormat::RESET]);
|
$translation = new TranslationContainer("chat.type.achievement", [$player->getDisplayName(), TextFormat::GREEN . Achievement::$list[$achievementId]["name"] . TextFormat::RESET]);
|
||||||
if(Server::getInstance()->getConfigBoolean("announce-player-achievements", true) === true){
|
if(Server::getInstance()->getConfigBool("announce-player-achievements", true)){
|
||||||
Server::getInstance()->broadcastMessage($translation);
|
Server::getInstance()->broadcastMessage($translation);
|
||||||
}else{
|
}else{
|
||||||
$player->sendMessage($translation);
|
$player->sendMessage($translation);
|
||||||
@ -147,6 +147,4 @@ abstract class Achievement{
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -64,6 +64,8 @@ class CrashDump{
|
|||||||
$this->extraData();
|
$this->extraData();
|
||||||
|
|
||||||
$this->encodeData();
|
$this->encodeData();
|
||||||
|
|
||||||
|
fclose($this->fp);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getPath() : string{
|
public function getPath() : string{
|
||||||
@ -115,10 +117,10 @@ class CrashDump{
|
|||||||
}
|
}
|
||||||
|
|
||||||
private function extraData(){
|
private function extraData(){
|
||||||
global $arguments;
|
global $argv;
|
||||||
|
|
||||||
if($this->server->getProperty("auto-report.send-settings", true) !== false){
|
if($this->server->getProperty("auto-report.send-settings", true) !== false){
|
||||||
$this->data["parameters"] = (array) $arguments;
|
$this->data["parameters"] = (array) $argv;
|
||||||
$this->data["server.properties"] = @file_get_contents($this->server->getDataPath() . "server.properties");
|
$this->data["server.properties"] = @file_get_contents($this->server->getDataPath() . "server.properties");
|
||||||
$this->data["server.properties"] = preg_replace("#^rcon\\.password=(.*)$#m", "rcon.password=******", $this->data["server.properties"]);
|
$this->data["server.properties"] = preg_replace("#^rcon\\.password=(.*)$#m", "rcon.password=******", $this->data["server.properties"]);
|
||||||
$this->data["pocketmine.yml"] = @file_get_contents($this->server->getDataPath() . "pocketmine.yml");
|
$this->data["pocketmine.yml"] = @file_get_contents($this->server->getDataPath() . "pocketmine.yml");
|
||||||
@ -148,7 +150,7 @@ class CrashDump{
|
|||||||
$error = $lastExceptionError;
|
$error = $lastExceptionError;
|
||||||
}else{
|
}else{
|
||||||
$error = (array) error_get_last();
|
$error = (array) error_get_last();
|
||||||
$error["trace"] = getTrace(4); //Skipping CrashDump->baseCrash, CrashDump->construct, Server->crashDump
|
$error["trace"] = Utils::getTrace(4); //Skipping CrashDump->baseCrash, CrashDump->construct, Server->crashDump
|
||||||
$errorConversion = [
|
$errorConversion = [
|
||||||
E_ERROR => "E_ERROR",
|
E_ERROR => "E_ERROR",
|
||||||
E_WARNING => "E_WARNING",
|
E_WARNING => "E_WARNING",
|
||||||
@ -167,7 +169,7 @@ class CrashDump{
|
|||||||
E_USER_DEPRECATED => "E_USER_DEPRECATED"
|
E_USER_DEPRECATED => "E_USER_DEPRECATED"
|
||||||
];
|
];
|
||||||
$error["fullFile"] = $error["file"];
|
$error["fullFile"] = $error["file"];
|
||||||
$error["file"] = cleanPath($error["file"]);
|
$error["file"] = Utils::cleanPath($error["file"]);
|
||||||
$error["type"] = $errorConversion[$error["type"]] ?? $error["type"];
|
$error["type"] = $errorConversion[$error["type"]] ?? $error["type"];
|
||||||
if(($pos = strpos($error["message"], "\n")) !== false){
|
if(($pos = strpos($error["message"], "\n")) !== false){
|
||||||
$error["message"] = substr($error["message"], 0, $pos);
|
$error["message"] = substr($error["message"], 0, $pos);
|
||||||
@ -186,7 +188,7 @@ class CrashDump{
|
|||||||
$this->addLine("Line: " . $error["line"]);
|
$this->addLine("Line: " . $error["line"]);
|
||||||
$this->addLine("Type: " . $error["type"]);
|
$this->addLine("Type: " . $error["type"]);
|
||||||
|
|
||||||
if(strpos($error["file"], "src/pocketmine/") === false and strpos($error["file"], "src/raklib/") === false and file_exists($error["fullFile"])){
|
if(strpos($error["file"], "src/pocketmine/") === false and strpos($error["file"], "vendor/pocketmine/") === false and file_exists($error["fullFile"])){
|
||||||
$this->addLine();
|
$this->addLine();
|
||||||
$this->addLine("THIS CRASH WAS CAUSED BY A PLUGIN");
|
$this->addLine("THIS CRASH WAS CAUSED BY A PLUGIN");
|
||||||
$this->data["plugin"] = true;
|
$this->data["plugin"] = true;
|
||||||
@ -195,7 +197,7 @@ class CrashDump{
|
|||||||
$file = $reflection->getProperty("file");
|
$file = $reflection->getProperty("file");
|
||||||
$file->setAccessible(true);
|
$file->setAccessible(true);
|
||||||
foreach($this->server->getPluginManager()->getPlugins() as $plugin){
|
foreach($this->server->getPluginManager()->getPlugins() as $plugin){
|
||||||
$filePath = \pocketmine\cleanPath($file->getValue($plugin));
|
$filePath = Utils::cleanPath($file->getValue($plugin));
|
||||||
if(strpos($error["file"], $filePath) === 0){
|
if(strpos($error["file"], $filePath) === 0){
|
||||||
$this->data["plugin"] = $plugin->getName();
|
$this->data["plugin"] = $plugin->getName();
|
||||||
$this->addLine("BAD PLUGIN: " . $plugin->getDescription()->getFullName());
|
$this->addLine("BAD PLUGIN: " . $plugin->getDescription()->getFullName());
|
||||||
@ -227,13 +229,13 @@ class CrashDump{
|
|||||||
}
|
}
|
||||||
|
|
||||||
private function generalData(){
|
private function generalData(){
|
||||||
$version = new VersionString();
|
$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
|
||||||
$this->data["general"] = [];
|
$this->data["general"] = [];
|
||||||
$this->data["general"]["name"] = $this->server->getName();
|
$this->data["general"]["name"] = $this->server->getName();
|
||||||
$this->data["general"]["version"] = $version->get(false);
|
$this->data["general"]["version"] = $version->getFullVersion(false);
|
||||||
$this->data["general"]["build"] = $version->getBuild();
|
$this->data["general"]["build"] = $version->getBuild();
|
||||||
$this->data["general"]["protocol"] = ProtocolInfo::CURRENT_PROTOCOL;
|
$this->data["general"]["protocol"] = ProtocolInfo::CURRENT_PROTOCOL;
|
||||||
$this->data["general"]["api"] = \pocketmine\API_VERSION;
|
$this->data["general"]["api"] = \pocketmine\BASE_VERSION;
|
||||||
$this->data["general"]["git"] = \pocketmine\GIT_COMMIT;
|
$this->data["general"]["git"] = \pocketmine\GIT_COMMIT;
|
||||||
$this->data["general"]["raklib"] = RakLib::VERSION;
|
$this->data["general"]["raklib"] = RakLib::VERSION;
|
||||||
$this->data["general"]["uname"] = php_uname("a");
|
$this->data["general"]["uname"] = php_uname("a");
|
||||||
@ -241,7 +243,7 @@ class CrashDump{
|
|||||||
$this->data["general"]["zend"] = zend_version();
|
$this->data["general"]["zend"] = zend_version();
|
||||||
$this->data["general"]["php_os"] = PHP_OS;
|
$this->data["general"]["php_os"] = PHP_OS;
|
||||||
$this->data["general"]["os"] = Utils::getOS();
|
$this->data["general"]["os"] = Utils::getOS();
|
||||||
$this->addLine($this->server->getName() . " version: " . $version->get(false) . " #" . $version->getBuild() . " [Protocol " . ProtocolInfo::CURRENT_PROTOCOL . "; API " . API_VERSION . "]");
|
$this->addLine($this->server->getName() . " version: " . $version->getFullVersion(true) . " [Protocol " . ProtocolInfo::CURRENT_PROTOCOL . "]");
|
||||||
$this->addLine("Git commit: " . GIT_COMMIT);
|
$this->addLine("Git commit: " . GIT_COMMIT);
|
||||||
$this->addLine("uname -a: " . php_uname("a"));
|
$this->addLine("uname -a: " . php_uname("a"));
|
||||||
$this->addLine("PHP Version: " . phpversion());
|
$this->addLine("PHP Version: " . phpversion());
|
||||||
@ -256,5 +258,4 @@ class CrashDump{
|
|||||||
public function add($str){
|
public function add($str){
|
||||||
fwrite($this->fp, $str);
|
fwrite($this->fp, $str);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
@ -24,10 +24,9 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine;
|
namespace pocketmine;
|
||||||
|
|
||||||
use pocketmine\event\server\LowMemoryEvent;
|
use pocketmine\event\server\LowMemoryEvent;
|
||||||
use pocketmine\event\Timings;
|
|
||||||
use pocketmine\scheduler\DumpWorkerMemoryTask;
|
use pocketmine\scheduler\DumpWorkerMemoryTask;
|
||||||
use pocketmine\scheduler\GarbageCollectionTask;
|
use pocketmine\scheduler\GarbageCollectionTask;
|
||||||
use pocketmine\utils\MainLogger;
|
use pocketmine\timings\Timings;
|
||||||
use pocketmine\utils\Utils;
|
use pocketmine\utils\Utils;
|
||||||
|
|
||||||
class MemoryManager{
|
class MemoryManager{
|
||||||
@ -68,8 +67,6 @@ class MemoryManager{
|
|||||||
private $lowMemChunkRadiusOverride;
|
private $lowMemChunkRadiusOverride;
|
||||||
/** @var bool */
|
/** @var bool */
|
||||||
private $lowMemChunkGC;
|
private $lowMemChunkGC;
|
||||||
/** @var bool */
|
|
||||||
private $lowMemReduceChunkRadius;
|
|
||||||
|
|
||||||
/** @var bool */
|
/** @var bool */
|
||||||
private $lowMemDisableChunkCache;
|
private $lowMemDisableChunkCache;
|
||||||
@ -245,9 +242,9 @@ class MemoryManager{
|
|||||||
Timings::$garbageCollectorTimer->startTiming();
|
Timings::$garbageCollectorTimer->startTiming();
|
||||||
|
|
||||||
if($this->garbageCollectionAsync){
|
if($this->garbageCollectionAsync){
|
||||||
$size = $this->server->getScheduler()->getAsyncTaskPoolSize();
|
$pool = $this->server->getAsyncPool();
|
||||||
for($i = 0; $i < $size; ++$i){
|
foreach($pool->getRunningWorkers() as $i){
|
||||||
$this->server->getScheduler()->scheduleAsyncTaskToWorker(new GarbageCollectionTask(), $i);
|
$pool->submitTaskToWorker(new GarbageCollectionTask(), $i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -266,13 +263,13 @@ class MemoryManager{
|
|||||||
* @param int $maxStringSize
|
* @param int $maxStringSize
|
||||||
*/
|
*/
|
||||||
public function dumpServerMemory(string $outputFolder, int $maxNesting, int $maxStringSize){
|
public function dumpServerMemory(string $outputFolder, int $maxNesting, int $maxStringSize){
|
||||||
MainLogger::getLogger()->notice("[Dump] After the memory dump is done, the server might crash");
|
$this->server->getLogger()->notice("[Dump] After the memory dump is done, the server might crash");
|
||||||
self::dumpMemory($this->server, $this->server->getLoader(), $outputFolder, $maxNesting, $maxStringSize);
|
self::dumpMemory($this->server, $outputFolder, $maxNesting, $maxStringSize, $this->server->getLogger());
|
||||||
|
|
||||||
if($this->dumpWorkers){
|
if($this->dumpWorkers){
|
||||||
$scheduler = $this->server->getScheduler();
|
$pool = $this->server->getAsyncPool();
|
||||||
for($i = 0, $size = $scheduler->getAsyncTaskPoolSize(); $i < $size; ++$i){
|
foreach($pool->getRunningWorkers() as $i){
|
||||||
$scheduler->scheduleAsyncTaskToWorker(new DumpWorkerMemoryTask($outputFolder, $maxNesting, $maxStringSize), $i);
|
$pool->submitTaskToWorker(new DumpWorkerMemoryTask($outputFolder, $maxNesting, $maxStringSize), $i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -280,13 +277,15 @@ class MemoryManager{
|
|||||||
/**
|
/**
|
||||||
* Static memory dumper accessible from any thread.
|
* Static memory dumper accessible from any thread.
|
||||||
*
|
*
|
||||||
* @param mixed $startingObject
|
* @param mixed $startingObject
|
||||||
* @param \ClassLoader $loader
|
* @param string $outputFolder
|
||||||
* @param string $outputFolder
|
* @param int $maxNesting
|
||||||
* @param int $maxNesting
|
* @param int $maxStringSize
|
||||||
* @param int $maxStringSize
|
* @param \Logger $logger
|
||||||
|
*
|
||||||
|
* @throws \ReflectionException
|
||||||
*/
|
*/
|
||||||
public static function dumpMemory($startingObject, \ClassLoader $loader, string $outputFolder, int $maxNesting, int $maxStringSize){
|
public static function dumpMemory($startingObject, string $outputFolder, int $maxNesting, int $maxStringSize, \Logger $logger){
|
||||||
$hardLimit = ini_get('memory_limit');
|
$hardLimit = ini_get('memory_limit');
|
||||||
ini_set('memory_limit', '-1');
|
ini_set('memory_limit', '-1');
|
||||||
gc_disable();
|
gc_disable();
|
||||||
@ -308,7 +307,7 @@ class MemoryManager{
|
|||||||
$staticProperties = [];
|
$staticProperties = [];
|
||||||
$staticCount = 0;
|
$staticCount = 0;
|
||||||
|
|
||||||
foreach($loader->getClasses() as $className){
|
foreach(get_declared_classes() as $className){
|
||||||
$reflection = new \ReflectionClass($className);
|
$reflection = new \ReflectionClass($className);
|
||||||
$staticProperties[$className] = [];
|
$staticProperties[$className] = [];
|
||||||
foreach($reflection->getProperties() as $property){
|
foreach($reflection->getProperties() as $property){
|
||||||
@ -330,9 +329,9 @@ class MemoryManager{
|
|||||||
}
|
}
|
||||||
|
|
||||||
file_put_contents($outputFolder . "/staticProperties.js", json_encode($staticProperties, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
|
file_put_contents($outputFolder . "/staticProperties.js", json_encode($staticProperties, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
|
||||||
MainLogger::getLogger()->info("[Dump] Wrote $staticCount static properties");
|
$logger->info("[Dump] Wrote $staticCount static properties");
|
||||||
|
|
||||||
if($GLOBALS !== null){ //This might be null if we're on a different thread
|
if(isset($GLOBALS)){ //This might be null if we're on a different thread
|
||||||
$globalVariables = [];
|
$globalVariables = [];
|
||||||
$globalCount = 0;
|
$globalCount = 0;
|
||||||
|
|
||||||
@ -358,7 +357,7 @@ class MemoryManager{
|
|||||||
}
|
}
|
||||||
|
|
||||||
file_put_contents($outputFolder . "/globalVariables.js", json_encode($globalVariables, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
|
file_put_contents($outputFolder . "/globalVariables.js", json_encode($globalVariables, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
|
||||||
MainLogger::getLogger()->info("[Dump] Wrote $globalCount global variables");
|
$logger->info("[Dump] Wrote $globalCount global variables");
|
||||||
}
|
}
|
||||||
|
|
||||||
self::continueDump($startingObject, $data, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
|
self::continueDump($startingObject, $data, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
|
||||||
@ -395,15 +394,22 @@ class MemoryManager{
|
|||||||
$info["implements"] = implode(", ", $reflection->getInterfaceNames());
|
$info["implements"] = implode(", ", $reflection->getInterfaceNames());
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach($reflection->getProperties() as $property){
|
for($original = $reflection; $reflection !== false; $reflection = $reflection->getParentClass()){
|
||||||
if($property->isStatic()){
|
foreach($reflection->getProperties() as $property){
|
||||||
continue;
|
if($property->isStatic()){
|
||||||
}
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if(!$property->isPublic()){
|
$name = $property->getName();
|
||||||
$property->setAccessible(true);
|
if($reflection !== $original and !$property->isPublic()){
|
||||||
|
$name = $reflection->getName() . ":" . $name;
|
||||||
|
}
|
||||||
|
if(!$property->isPublic()){
|
||||||
|
$property->setAccessible(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
self::continueDump($property->getValue($object), $info["properties"][$name], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
|
||||||
}
|
}
|
||||||
self::continueDump($property->getValue($object), $info["properties"][$property->getName()], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fwrite($obData, "$hash@$className: " . json_encode($info, JSON_UNESCAPED_SLASHES) . "\n");
|
fwrite($obData, "$hash@$className: " . json_encode($info, JSON_UNESCAPED_SLASHES) . "\n");
|
||||||
@ -412,7 +418,7 @@ class MemoryManager{
|
|||||||
|
|
||||||
}while($continue);
|
}while($continue);
|
||||||
|
|
||||||
MainLogger::getLogger()->info("[Dump] Wrote " . count($objects) . " objects");
|
$logger->info("[Dump] Wrote " . count($objects) . " objects");
|
||||||
|
|
||||||
fclose($obData);
|
fclose($obData);
|
||||||
|
|
||||||
@ -422,7 +428,7 @@ class MemoryManager{
|
|||||||
arsort($instanceCounts, SORT_NUMERIC);
|
arsort($instanceCounts, SORT_NUMERIC);
|
||||||
file_put_contents($outputFolder . "/instanceCounts.js", json_encode($instanceCounts, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
|
file_put_contents($outputFolder . "/instanceCounts.js", json_encode($instanceCounts, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
|
||||||
|
|
||||||
MainLogger::getLogger()->info("[Dump] Finished!");
|
$logger->info("[Dump] Finished!");
|
||||||
|
|
||||||
ini_set('memory_limit', $hardLimit);
|
ini_set('memory_limit', $hardLimit);
|
||||||
gc_enable();
|
gc_enable();
|
||||||
|
@ -72,7 +72,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($value === true){
|
if($value){
|
||||||
$this->server->addOp(strtolower($this->getName()));
|
$this->server->addOp(strtolower($this->getName()));
|
||||||
}else{
|
}else{
|
||||||
$this->server->removeOp(strtolower($this->getName()));
|
$this->server->removeOp(strtolower($this->getName()));
|
||||||
@ -84,7 +84,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function setBanned(bool $value){
|
public function setBanned(bool $value){
|
||||||
if($value === true){
|
if($value){
|
||||||
$this->server->getNameBans()->addBan($this->getName(), null, null, null);
|
$this->server->getNameBans()->addBan($this->getName(), null, null, null);
|
||||||
}else{
|
}else{
|
||||||
$this->server->getNameBans()->remove($this->getName());
|
$this->server->getNameBans()->remove($this->getName());
|
||||||
@ -96,7 +96,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function setWhitelisted(bool $value){
|
public function setWhitelisted(bool $value){
|
||||||
if($value === true){
|
if($value){
|
||||||
$this->server->addWhitelist(strtolower($this->getName()));
|
$this->server->addWhitelist(strtolower($this->getName()));
|
||||||
}else{
|
}else{
|
||||||
$this->server->removeWhitelist(strtolower($this->getName()));
|
$this->server->removeWhitelist(strtolower($this->getName()));
|
||||||
@ -108,11 +108,11 @@ class OfflinePlayer implements IPlayer, Metadatable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getFirstPlayed(){
|
public function getFirstPlayed(){
|
||||||
return $this->namedtag instanceof CompoundTag ? $this->namedtag["firstPlayed"] : null;
|
return $this->namedtag instanceof CompoundTag ? $this->namedtag->getLong("firstPlayed", 0, true) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getLastPlayed(){
|
public function getLastPlayed(){
|
||||||
return $this->namedtag instanceof CompoundTag ? $this->namedtag["lastPlayed"] : null;
|
return $this->namedtag instanceof CompoundTag ? $this->namedtag->getLong("lastPlayed", 0, true) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function hasPlayedBefore() : bool{
|
public function hasPlayedBefore() : bool{
|
||||||
@ -134,6 +134,4 @@ class OfflinePlayer implements IPlayer, Metadatable{
|
|||||||
public function removeMetadata(string $metadataKey, Plugin $owningPlugin){
|
public function removeMetadata(string $metadataKey, Plugin $owningPlugin){
|
||||||
$this->server->getPlayerMetadata()->removeMetadata($this, $metadataKey, $owningPlugin);
|
$this->server->getPlayerMetadata()->removeMetadata($this, $metadataKey, $owningPlugin);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -24,155 +24,139 @@ declare(strict_types=1);
|
|||||||
namespace {
|
namespace {
|
||||||
const INT32_MIN = -0x80000000;
|
const INT32_MIN = -0x80000000;
|
||||||
const INT32_MAX = 0x7fffffff;
|
const INT32_MAX = 0x7fffffff;
|
||||||
|
|
||||||
function safe_var_dump(){
|
|
||||||
static $cnt = 0;
|
|
||||||
foreach(func_get_args() as $var){
|
|
||||||
switch(true){
|
|
||||||
case is_array($var):
|
|
||||||
echo str_repeat(" ", $cnt) . "array(" . count($var) . ") {" . PHP_EOL;
|
|
||||||
foreach($var as $key => $value){
|
|
||||||
echo str_repeat(" ", $cnt + 1) . "[" . (is_int($key) ? $key : '"' . $key . '"') . "]=>" . PHP_EOL;
|
|
||||||
++$cnt;
|
|
||||||
safe_var_dump($value);
|
|
||||||
--$cnt;
|
|
||||||
}
|
|
||||||
echo str_repeat(" ", $cnt) . "}" . PHP_EOL;
|
|
||||||
break;
|
|
||||||
case is_int($var):
|
|
||||||
echo str_repeat(" ", $cnt) . "int(" . $var . ")" . PHP_EOL;
|
|
||||||
break;
|
|
||||||
case is_float($var):
|
|
||||||
echo str_repeat(" ", $cnt) . "float(" . $var . ")" . PHP_EOL;
|
|
||||||
break;
|
|
||||||
case is_bool($var):
|
|
||||||
echo str_repeat(" ", $cnt) . "bool(" . ($var === true ? "true" : "false") . ")" . PHP_EOL;
|
|
||||||
break;
|
|
||||||
case is_string($var):
|
|
||||||
echo str_repeat(" ", $cnt) . "string(" . strlen($var) . ") \"$var\"" . PHP_EOL;
|
|
||||||
break;
|
|
||||||
case is_resource($var):
|
|
||||||
echo str_repeat(" ", $cnt) . "resource() of type (" . get_resource_type($var) . ")" . PHP_EOL;
|
|
||||||
break;
|
|
||||||
case is_object($var):
|
|
||||||
echo str_repeat(" ", $cnt) . "object(" . get_class($var) . ")" . PHP_EOL;
|
|
||||||
break;
|
|
||||||
case is_null($var):
|
|
||||||
echo str_repeat(" ", $cnt) . "NULL" . PHP_EOL;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function dummy(){
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace pocketmine {
|
namespace pocketmine {
|
||||||
|
|
||||||
use pocketmine\utils\Binary;
|
|
||||||
use pocketmine\utils\MainLogger;
|
use pocketmine\utils\MainLogger;
|
||||||
use pocketmine\utils\ServerKiller;
|
use pocketmine\utils\ServerKiller;
|
||||||
use pocketmine\utils\Terminal;
|
use pocketmine\utils\Terminal;
|
||||||
|
use pocketmine\utils\Timezone;
|
||||||
use pocketmine\utils\Utils;
|
use pocketmine\utils\Utils;
|
||||||
|
use pocketmine\utils\VersionString;
|
||||||
use pocketmine\wizard\SetupWizard;
|
use pocketmine\wizard\SetupWizard;
|
||||||
use raklib\RakLib;
|
|
||||||
|
|
||||||
const NAME = "PocketMine-MP";
|
const NAME = "PocketMine-MP";
|
||||||
const VERSION = "1.7dev";
|
const BASE_VERSION = "3.1.3";
|
||||||
const API_VERSION = "3.0.0-ALPHA9";
|
const IS_DEVELOPMENT_BUILD = false;
|
||||||
const CODENAME = "[REDACTED]";
|
const BUILD_NUMBER = 0;
|
||||||
|
|
||||||
const MIN_PHP_VERSION = "7.2.0RC3";
|
const MIN_PHP_VERSION = "7.2.0";
|
||||||
|
|
||||||
|
function critical_error($message){
|
||||||
|
echo "[ERROR] $message" . PHP_EOL;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Startup code. Do not look at it, it may harm you.
|
* Startup code. Do not look at it, it may harm you.
|
||||||
* Most of them are hacks to fix date-related bugs, or basic functions used after this
|
|
||||||
* This is the only non-class based file on this project.
|
* This is the only non-class based file on this project.
|
||||||
* Enjoy it as much as I did writing it. I don't want to do it again.
|
* Enjoy it as much as I did writing it. I don't want to do it again.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if(version_compare(MIN_PHP_VERSION, PHP_VERSION) > 0){
|
if(version_compare(MIN_PHP_VERSION, PHP_VERSION) > 0){
|
||||||
echo "[CRITICAL] " . \pocketmine\NAME . " requires PHP >= " . MIN_PHP_VERSION . ", but you have PHP " . PHP_VERSION . "." . PHP_EOL;
|
critical_error(\pocketmine\NAME . " requires PHP >= " . MIN_PHP_VERSION . ", but you have PHP " . PHP_VERSION . ".");
|
||||||
echo "[CRITICAL] Please use the installer provided on the homepage, or update to a newer PHP version." . PHP_EOL;
|
critical_error("Please refer to the installation instructions at http://pmmp.rtfd.io/en/rtfd/installation.html.");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!extension_loaded("pthreads")){
|
if(PHP_INT_SIZE < 8){
|
||||||
echo "[CRITICAL] Unable to find the pthreads extension." . PHP_EOL;
|
critical_error("Running " . \pocketmine\NAME . " with 32-bit systems/PHP is no longer supported.");
|
||||||
echo "[CRITICAL] Please use the installer provided on the homepage." . PHP_EOL;
|
critical_error("Please upgrade to a 64-bit system, or use a 64-bit PHP binary if this is a 64-bit system.");
|
||||||
|
critical_error("Please refer to the installation instructions at http://pmmp.rtfd.io/en/rtfd/installation.html.");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Dependencies check */
|
||||||
|
|
||||||
|
$errors = 0;
|
||||||
|
|
||||||
|
if(php_sapi_name() !== "cli"){
|
||||||
|
critical_error("You must run " . \pocketmine\NAME . " using the CLI.");
|
||||||
|
++$errors;
|
||||||
|
}
|
||||||
|
|
||||||
|
$extensions = [
|
||||||
|
"bcmath" => "BC Math",
|
||||||
|
"curl" => "cURL",
|
||||||
|
"ctype" => "ctype",
|
||||||
|
"date" => "Date",
|
||||||
|
"hash" => "Hash",
|
||||||
|
"json" => "JSON",
|
||||||
|
"mbstring" => "Multibyte String",
|
||||||
|
"openssl" => "OpenSSL",
|
||||||
|
"pcre" => "PCRE",
|
||||||
|
"phar" => "Phar",
|
||||||
|
"pthreads" => "pthreads",
|
||||||
|
"reflection" => "Reflection",
|
||||||
|
"sockets" => "Sockets",
|
||||||
|
"spl" => "SPL",
|
||||||
|
"yaml" => "YAML",
|
||||||
|
"zip" => "Zip",
|
||||||
|
"zlib" => "Zlib"
|
||||||
|
];
|
||||||
|
|
||||||
|
foreach($extensions as $ext => $name){
|
||||||
|
if(!extension_loaded($ext)){
|
||||||
|
critical_error("Unable to find the $name ($ext) extension.");
|
||||||
|
++$errors;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(extension_loaded("pthreads")){
|
||||||
|
$pthreads_version = phpversion("pthreads");
|
||||||
|
if(substr_count($pthreads_version, ".") < 2){
|
||||||
|
$pthreads_version = "0.$pthreads_version";
|
||||||
|
}
|
||||||
|
if(version_compare($pthreads_version, "3.1.7dev") < 0){
|
||||||
|
critical_error("pthreads >= 3.1.7dev is required, while you have $pthreads_version.");
|
||||||
|
++$errors;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(extension_loaded("leveldb")){
|
||||||
|
$leveldb_version = phpversion("leveldb");
|
||||||
|
if(version_compare($leveldb_version, "0.2.1") < 0){
|
||||||
|
critical_error("php-leveldb >= 0.2.1 is required, while you have $leveldb_version");
|
||||||
|
++$errors;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(extension_loaded("pocketmine")){
|
||||||
|
critical_error("The native PocketMine extension is no longer supported.");
|
||||||
|
++$errors;
|
||||||
|
}
|
||||||
|
|
||||||
|
if($errors > 0){
|
||||||
|
critical_error("Please recompile PHP with the needed configuration, or refer to the installation instructions at http://pmmp.rtfd.io/en/rtfd/installation.html.");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
error_reporting(-1);
|
error_reporting(-1);
|
||||||
|
|
||||||
function error_handler($severity, $message, $file, $line){
|
|
||||||
if(error_reporting() & $severity){
|
|
||||||
throw new \ErrorException($message, 0, $severity, $file, $line);
|
|
||||||
}else{ //stfu operator
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
set_error_handler('\pocketmine\error_handler');
|
|
||||||
|
|
||||||
if(!extension_loaded("phar")){
|
|
||||||
echo "[CRITICAL] Unable to find the Phar extension." . PHP_EOL;
|
|
||||||
echo "[CRITICAL] Please use the installer provided on the homepage." . PHP_EOL;
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(\Phar::running(true) !== ""){
|
if(\Phar::running(true) !== ""){
|
||||||
define('pocketmine\PATH', \Phar::running(true) . "/");
|
define('pocketmine\PATH', \Phar::running(true) . "/");
|
||||||
}else{
|
}else{
|
||||||
define('pocketmine\PATH', dirname(__FILE__, 3) . DIRECTORY_SEPARATOR);
|
define('pocketmine\PATH', dirname(__FILE__, 3) . DIRECTORY_SEPARATOR);
|
||||||
}
|
}
|
||||||
|
|
||||||
$requiredSplVer = "0.0.1";
|
define('pocketmine\COMPOSER_AUTOLOADER_PATH', \pocketmine\PATH . 'vendor/autoload.php');
|
||||||
if(!is_file(\pocketmine\PATH . "src/spl/version.php")){
|
|
||||||
echo "[CRITICAL] Cannot find PocketMine-SPL or incompatible version." . PHP_EOL;
|
|
||||||
echo "[CRITICAL] Please update your submodules or use provided builds." . PHP_EOL;
|
|
||||||
exit(1);
|
|
||||||
}elseif(version_compare($requiredSplVer, require(\pocketmine\PATH . "src/spl/version.php")) > 0){
|
|
||||||
echo "[CRITICAL] Incompatible PocketMine-SPL submodule version ($requiredSplVer is required)." . PHP_EOL;
|
|
||||||
echo "[CRITICAL] Please update your submodules or use provided builds." . PHP_EOL;
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(is_file(\pocketmine\PATH . "vendor/autoload.php")){
|
if(is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){
|
||||||
require_once(\pocketmine\PATH . "vendor/autoload.php");
|
require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH);
|
||||||
}else{
|
}else{
|
||||||
echo "[CRITICAL] Composer autoloader not found" . PHP_EOL;
|
critical_error("Composer autoloader not found.");
|
||||||
echo "[CRITICAL] Please initialize composer dependencies before running." . PHP_EOL;
|
critical_error("Please install/update Composer dependencies or use provided builds.");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!class_exists("ClassLoader", false)){
|
set_error_handler([Utils::class, 'errorExceptionHandler']);
|
||||||
require_once(\pocketmine\PATH . "src/spl/ClassLoader.php");
|
|
||||||
require_once(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We now use the Composer autoloader, but this autoloader is still used by RakLib and for loading plugins.
|
* We now use the Composer autoloader, but this autoloader is still for loading plugins.
|
||||||
*/
|
*/
|
||||||
$autoloader = new \BaseClassLoader();
|
$autoloader = new \BaseClassLoader();
|
||||||
$autoloader->addPath(\pocketmine\PATH . "src");
|
|
||||||
$autoloader->addPath(\pocketmine\PATH . "src" . DIRECTORY_SEPARATOR . "spl");
|
|
||||||
$autoloader->register(false);
|
$autoloader->register(false);
|
||||||
|
|
||||||
if(!class_exists(RakLib::class)){
|
|
||||||
echo "[CRITICAL] Unable to find the RakLib library." . PHP_EOL;
|
|
||||||
echo "[CRITICAL] Please use provided builds or clone the repository recursively." . PHP_EOL;
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(version_compare(RakLib::VERSION, "0.8.1") < 0){
|
|
||||||
echo "[CRITICAL] RakLib version 0.8.1 is required, while you have version " . RakLib::VERSION . "." . PHP_EOL;
|
|
||||||
echo "[CRITICAL] Please update your submodules or use provided builds." . PHP_EOL;
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
set_time_limit(0); //Who set it to 30 seconds?!?!
|
set_time_limit(0); //Who set it to 30 seconds?!?!
|
||||||
|
|
||||||
ini_set("allow_url_fopen", '1');
|
ini_set("allow_url_fopen", '1');
|
||||||
@ -183,364 +167,64 @@ namespace pocketmine {
|
|||||||
ini_set("memory_limit", '-1');
|
ini_set("memory_limit", '-1');
|
||||||
define('pocketmine\START_TIME', microtime(true));
|
define('pocketmine\START_TIME', microtime(true));
|
||||||
|
|
||||||
$opts = getopt("", ["data:", "plugins:", "no-wizard", "enable-profiler"]);
|
define('pocketmine\RESOURCE_PATH', \pocketmine\PATH . 'src' . DIRECTORY_SEPARATOR . 'pocketmine' . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR);
|
||||||
|
|
||||||
define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR);
|
$opts = getopt("", ["data:", "plugins:", "no-wizard"]);
|
||||||
define('pocketmine\PLUGIN_PATH', isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
|
|
||||||
|
|
||||||
Terminal::init();
|
define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR);
|
||||||
|
define('pocketmine\PLUGIN_PATH', isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
|
||||||
define('pocketmine\ANSI', Terminal::hasFormattingCodes());
|
|
||||||
|
|
||||||
if(!file_exists(\pocketmine\DATA)){
|
if(!file_exists(\pocketmine\DATA)){
|
||||||
mkdir(\pocketmine\DATA, 0777, true);
|
mkdir(\pocketmine\DATA, 0777, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Logger has a dependency on timezone, so we'll set it to UTC until we can get the actual timezone.
|
//Logger has a dependency on timezone
|
||||||
date_default_timezone_set("UTC");
|
$tzError = Timezone::init();
|
||||||
|
|
||||||
$logger = new MainLogger(\pocketmine\DATA . "server.log");
|
$logger = new MainLogger(\pocketmine\DATA . "server.log");
|
||||||
$logger->registerStatic();
|
$logger->registerStatic();
|
||||||
|
|
||||||
do{
|
foreach($tzError as $e){
|
||||||
$timezone = ini_get("date.timezone");
|
$logger->warning($e);
|
||||||
if($timezone !== ""){
|
}
|
||||||
/*
|
unset($tzError);
|
||||||
* This is here so that people don't come to us complaining and fill up the issue tracker when they put
|
|
||||||
* an incorrect timezone abbreviation in php.ini apparently.
|
if(extension_loaded("xdebug")){
|
||||||
*/
|
$logger->warning(PHP_EOL . PHP_EOL . PHP_EOL . "\tYou are running " . \pocketmine\NAME . " with xdebug enabled. This has a major impact on performance." . PHP_EOL . PHP_EOL);
|
||||||
if(strpos($timezone, "/") === false){
|
}
|
||||||
$default_timezone = timezone_name_from_abbr($timezone);
|
|
||||||
if($default_timezone !== false){
|
if(\Phar::running(true) === ""){
|
||||||
ini_set("date.timezone", $default_timezone);
|
$logger->warning("Non-packaged " . \pocketmine\NAME . " installation detected. Consider using a phar in production for better performance.");
|
||||||
date_default_timezone_set($default_timezone);
|
}
|
||||||
break;
|
|
||||||
}else{
|
$version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
|
||||||
//Bad php.ini value, try another method to detect timezone
|
define('pocketmine\VERSION', $version->getFullVersion(true));
|
||||||
$logger->warning("Timezone \"$timezone\" could not be parsed as a valid timezone from php.ini, falling back to auto-detection");
|
|
||||||
}
|
$gitHash = str_repeat("00", 20);
|
||||||
}else{
|
|
||||||
date_default_timezone_set($timezone);
|
if(\Phar::running(true) === ""){
|
||||||
break;
|
if(Utils::execute("git rev-parse HEAD", $out) === 0 and $out !== false and strlen($out = trim($out)) === 40){
|
||||||
|
$gitHash = trim($out);
|
||||||
|
if(Utils::execute("git diff --quiet") === 1 or Utils::execute("git diff --cached --quiet") === 1){ //Locally-modified
|
||||||
|
$gitHash .= "-dirty";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}else{
|
||||||
if(($timezone = detect_system_timezone()) and date_default_timezone_set($timezone)){
|
$phar = new \Phar(\Phar::running(false));
|
||||||
//Success! Timezone has already been set and validated in the if statement.
|
$meta = $phar->getMetadata();
|
||||||
//This here is just for redundancy just in case some program wants to read timezone data from the ini.
|
if(isset($meta["git"])){
|
||||||
ini_set("date.timezone", $timezone);
|
$gitHash = $meta["git"];
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if($response = Utils::getURL("http://ip-api.com/json") //If system timezone detection fails or timezone is an invalid value.
|
|
||||||
and $ip_geolocation_data = json_decode($response, true)
|
|
||||||
and $ip_geolocation_data['status'] !== 'fail'
|
|
||||||
and date_default_timezone_set($ip_geolocation_data['timezone'])
|
|
||||||
){
|
|
||||||
//Again, for redundancy.
|
|
||||||
ini_set("date.timezone", $ip_geolocation_data['timezone']);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
ini_set("date.timezone", "UTC");
|
|
||||||
date_default_timezone_set("UTC");
|
|
||||||
$logger->warning("Timezone could not be automatically determined or was set to an invalid value. An incorrect timezone will result in incorrect timestamps on console logs. It has been set to \"UTC\" by default. You can change it on the php.ini file.");
|
|
||||||
}while(false);
|
|
||||||
|
|
||||||
|
|
||||||
function detect_system_timezone(){
|
|
||||||
switch(Utils::getOS()){
|
|
||||||
case 'win':
|
|
||||||
$regex = '/(UTC)(\+*\-*\d*\d*\:*\d*\d*)/';
|
|
||||||
|
|
||||||
/*
|
|
||||||
* wmic timezone get Caption
|
|
||||||
* Get the timezone offset
|
|
||||||
*
|
|
||||||
* Sample Output var_dump
|
|
||||||
* array(3) {
|
|
||||||
* [0] =>
|
|
||||||
* string(7) "Caption"
|
|
||||||
* [1] =>
|
|
||||||
* string(20) "(UTC+09:30) Adelaide"
|
|
||||||
* [2] =>
|
|
||||||
* string(0) ""
|
|
||||||
* }
|
|
||||||
*/
|
|
||||||
exec("wmic timezone get Caption", $output);
|
|
||||||
|
|
||||||
$string = trim(implode("\n", $output));
|
|
||||||
|
|
||||||
//Detect the Time Zone string
|
|
||||||
preg_match($regex, $string, $matches);
|
|
||||||
|
|
||||||
if(!isset($matches[2])){
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
$offset = $matches[2];
|
|
||||||
|
|
||||||
if($offset == ""){
|
|
||||||
return "UTC";
|
|
||||||
}
|
|
||||||
|
|
||||||
return parse_offset($offset);
|
|
||||||
case 'linux':
|
|
||||||
// Ubuntu / Debian.
|
|
||||||
if(file_exists('/etc/timezone')){
|
|
||||||
$data = file_get_contents('/etc/timezone');
|
|
||||||
if($data){
|
|
||||||
return trim($data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// RHEL / CentOS
|
|
||||||
if(file_exists('/etc/sysconfig/clock')){
|
|
||||||
$data = parse_ini_file('/etc/sysconfig/clock');
|
|
||||||
if(!empty($data['ZONE'])){
|
|
||||||
return trim($data['ZONE']);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Portable method for incompatible linux distributions.
|
|
||||||
|
|
||||||
$offset = trim(exec('date +%:z'));
|
|
||||||
|
|
||||||
if($offset == "+00:00"){
|
|
||||||
return "UTC";
|
|
||||||
}
|
|
||||||
|
|
||||||
return parse_offset($offset);
|
|
||||||
case 'mac':
|
|
||||||
if(is_link('/etc/localtime')){
|
|
||||||
$filename = readlink('/etc/localtime');
|
|
||||||
if(strpos($filename, '/usr/share/zoneinfo/') === 0){
|
|
||||||
$timezone = substr($filename, 20);
|
|
||||||
return trim($timezone);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
default:
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
define('pocketmine\GIT_COMMIT', $gitHash);
|
||||||
* @param string $offset In the format of +09:00, +02:00, -04:00 etc.
|
|
||||||
*
|
|
||||||
* @return string|bool
|
|
||||||
*/
|
|
||||||
function parse_offset($offset){
|
|
||||||
//Make signed offsets unsigned for date_parse
|
|
||||||
if(strpos($offset, '-') !== false){
|
|
||||||
$negative_offset = true;
|
|
||||||
$offset = str_replace('-', '', $offset);
|
|
||||||
}else{
|
|
||||||
if(strpos($offset, '+') !== false){
|
|
||||||
$negative_offset = false;
|
|
||||||
$offset = str_replace('+', '', $offset);
|
|
||||||
}else{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$parsed = date_parse($offset);
|
|
||||||
$offset = $parsed['hour'] * 3600 + $parsed['minute'] * 60 + $parsed['second'];
|
|
||||||
|
|
||||||
//After date_parse is done, put the sign back
|
@define("INT32_MASK", is_int(0xffffffff) ? 0xffffffff : -1);
|
||||||
if($negative_offset == true){
|
@ini_set("opcache.mmap_base", bin2hex(random_bytes(8))); //Fix OPCache address errors
|
||||||
$offset = -abs($offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
//And then, look the offset up.
|
|
||||||
//timezone_name_from_abbr is not used because it returns false on some(most) offsets because it's mapping function is weird.
|
|
||||||
//That's been a bug in PHP since 2008!
|
|
||||||
foreach(timezone_abbreviations_list() as $zones){
|
|
||||||
foreach($zones as $timezone){
|
|
||||||
if($timezone['offset'] == $offset){
|
|
||||||
return $timezone['timezone_id'];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(isset($opts["enable-profiler"])){
|
|
||||||
if(function_exists("profiler_enable")){
|
|
||||||
\profiler_enable();
|
|
||||||
$logger->notice("Execution is being profiled");
|
|
||||||
}else{
|
|
||||||
$logger->notice("No profiler found. Please install https://github.com/krakjoe/profiler");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function kill($pid){
|
|
||||||
switch(Utils::getOS()){
|
|
||||||
case "win":
|
|
||||||
exec("taskkill.exe /F /PID " . ((int) $pid) . " > NUL");
|
|
||||||
break;
|
|
||||||
case "mac":
|
|
||||||
case "linux":
|
|
||||||
default:
|
|
||||||
if(function_exists("posix_kill")){
|
|
||||||
posix_kill($pid, SIGKILL);
|
|
||||||
}else{
|
|
||||||
exec("kill -9 " . ((int) $pid) . " > /dev/null 2>&1");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param object $value
|
|
||||||
* @param bool $includeCurrent
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
function getReferenceCount($value, $includeCurrent = true){
|
|
||||||
ob_start();
|
|
||||||
debug_zval_dump($value);
|
|
||||||
$ret = explode("\n", ob_get_contents());
|
|
||||||
ob_end_clean();
|
|
||||||
|
|
||||||
if(count($ret) >= 1 and preg_match('/^.* refcount\\(([0-9]+)\\)\\{$/', trim($ret[0]), $m) > 0){
|
|
||||||
return ((int) $m[1]) - ($includeCurrent ? 3 : 4); //$value + zval call + extra call
|
|
||||||
}
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
function getTrace($start = 0, $trace = null){
|
|
||||||
if($trace === null){
|
|
||||||
if(function_exists("xdebug_get_function_stack")){
|
|
||||||
$trace = array_reverse(xdebug_get_function_stack());
|
|
||||||
}else{
|
|
||||||
$e = new \Exception();
|
|
||||||
$trace = $e->getTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$messages = [];
|
|
||||||
$j = 0;
|
|
||||||
for($i = (int) $start; isset($trace[$i]); ++$i, ++$j){
|
|
||||||
$params = "";
|
|
||||||
if(isset($trace[$i]["args"]) or isset($trace[$i]["params"])){
|
|
||||||
if(isset($trace[$i]["args"])){
|
|
||||||
$args = $trace[$i]["args"];
|
|
||||||
}else{
|
|
||||||
$args = $trace[$i]["params"];
|
|
||||||
}
|
|
||||||
|
|
||||||
$params = implode(", ", array_map(function($value){
|
|
||||||
return (is_object($value) ? get_class($value) . " object" : gettype($value) . " " . (is_array($value) ? "Array()" : Utils::printable(@strval($value))));
|
|
||||||
}, $args));
|
|
||||||
}
|
|
||||||
$messages[] = "#$j " . (isset($trace[$i]["file"]) ? cleanPath($trace[$i]["file"]) : "") . "(" . (isset($trace[$i]["line"]) ? $trace[$i]["line"] : "") . "): " . (isset($trace[$i]["class"]) ? $trace[$i]["class"] . (($trace[$i]["type"] === "dynamic" or $trace[$i]["type"] === "->") ? "->" : "::") : "") . $trace[$i]["function"] . "(" . Utils::printable($params) . ")";
|
|
||||||
}
|
|
||||||
|
|
||||||
return $messages;
|
|
||||||
}
|
|
||||||
|
|
||||||
function cleanPath($path){
|
|
||||||
return str_replace(["\\", ".php", "phar://", str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PATH), str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PLUGIN_PATH)], ["/", "", "", "", ""], $path);
|
|
||||||
}
|
|
||||||
|
|
||||||
$exitCode = 0;
|
$exitCode = 0;
|
||||||
|
|
||||||
do{
|
do{
|
||||||
$errors = 0;
|
|
||||||
|
|
||||||
if(PHP_INT_SIZE < 8){
|
|
||||||
$logger->critical("Running " . \pocketmine\NAME . " with 32-bit systems/PHP is no longer supported. Please upgrade to a 64-bit system or use a 64-bit PHP binary.");
|
|
||||||
$exitCode = 1;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(php_sapi_name() !== "cli"){
|
|
||||||
$logger->critical("You must run " . \pocketmine\NAME . " using the CLI.");
|
|
||||||
++$errors;
|
|
||||||
}
|
|
||||||
|
|
||||||
$pthreads_version = phpversion("pthreads");
|
|
||||||
if(substr_count($pthreads_version, ".") < 2){
|
|
||||||
$pthreads_version = "0.$pthreads_version";
|
|
||||||
}
|
|
||||||
if(version_compare($pthreads_version, "3.1.7-dev") < 0){
|
|
||||||
$logger->critical("pthreads >= 3.1.7-dev is required, while you have $pthreads_version.");
|
|
||||||
++$errors;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(extension_loaded("leveldb")){
|
|
||||||
$leveldb_version = phpversion("leveldb");
|
|
||||||
if(version_compare($leveldb_version, "0.2.0") < 0){
|
|
||||||
$logger->critical("php-leveldb >= 0.2.0 is required, while you have $leveldb_version");
|
|
||||||
++$errors;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(extension_loaded("pocketmine")){
|
|
||||||
if(version_compare(phpversion("pocketmine"), "0.0.1") < 0){
|
|
||||||
$logger->critical("You have the native PocketMine extension, but your version is lower than 0.0.1.");
|
|
||||||
++$errors;
|
|
||||||
}elseif(version_compare(phpversion("pocketmine"), "0.0.4") > 0){
|
|
||||||
$logger->critical("You have the native PocketMine extension, but your version is higher than 0.0.4.");
|
|
||||||
++$errors;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(extension_loaded("xdebug")){
|
|
||||||
$logger->warning(PHP_EOL . PHP_EOL . PHP_EOL . "\tYou are running " . \pocketmine\NAME . " with xdebug enabled. This has a major impact on performance." . PHP_EOL . PHP_EOL);
|
|
||||||
}
|
|
||||||
|
|
||||||
$extensions = [
|
|
||||||
"bcmath" => "BC Math",
|
|
||||||
"curl" => "cURL",
|
|
||||||
"json" => "JSON",
|
|
||||||
"mbstring" => "Multibyte String",
|
|
||||||
"yaml" => "YAML",
|
|
||||||
"sockets" => "Sockets",
|
|
||||||
"zip" => "Zip",
|
|
||||||
"zlib" => "Zlib"
|
|
||||||
];
|
|
||||||
|
|
||||||
foreach($extensions as $ext => $name){
|
|
||||||
if(!extension_loaded($ext)){
|
|
||||||
$logger->critical("Unable to find the $name ($ext) extension.");
|
|
||||||
++$errors;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if($errors > 0){
|
|
||||||
$logger->critical("Please use the installer provided on the homepage, or recompile PHP again.");
|
|
||||||
$exitCode = 1;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
$gitHash = str_repeat("00", 20);
|
|
||||||
|
|
||||||
if(\Phar::running(true) === ""){
|
|
||||||
if(Utils::execute("git rev-parse HEAD", $out) === 0){
|
|
||||||
$gitHash = trim($out);
|
|
||||||
if(Utils::execute("git diff --quiet") === 1 or Utils::execute("git diff --cached --quiet") === 1){ //Locally-modified
|
|
||||||
$gitHash .= "-dirty";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
$phar = new \Phar(\Phar::running(false));
|
|
||||||
$meta = $phar->getMetadata();
|
|
||||||
if(isset($meta["git"])){
|
|
||||||
$gitHash = $meta["git"];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
define('pocketmine\GIT_COMMIT', $gitHash);
|
|
||||||
|
|
||||||
|
|
||||||
@define("ENDIANNESS", (pack("d", 1) === "\77\360\0\0\0\0\0\0" ? Binary::BIG_ENDIAN : Binary::LITTLE_ENDIAN));
|
|
||||||
@define("INT32_MASK", is_int(0xffffffff) ? 0xffffffff : -1);
|
|
||||||
@ini_set("opcache.mmap_base", bin2hex(random_bytes(8))); //Fix OPCache address errors
|
|
||||||
|
|
||||||
|
|
||||||
if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){
|
if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){
|
||||||
$installer = new SetupWizard();
|
$installer = new SetupWizard();
|
||||||
if(!$installer->run()){
|
if(!$installer->run()){
|
||||||
@ -549,25 +233,20 @@ namespace pocketmine {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(\Phar::running(true) === ""){
|
|
||||||
$logger->warning("Non-packaged " . \pocketmine\NAME . " installation detected. Consider using a phar in production for better performance.");
|
|
||||||
}
|
|
||||||
|
|
||||||
ThreadManager::init();
|
ThreadManager::init();
|
||||||
new Server($autoloader, $logger, \pocketmine\PATH, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
|
new Server($autoloader, $logger, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
|
||||||
|
|
||||||
$logger->info("Stopping other threads");
|
$logger->info("Stopping other threads");
|
||||||
|
|
||||||
$killer = new ServerKiller(8);
|
$killer = new ServerKiller(8);
|
||||||
$killer->start();
|
$killer->start(PTHREADS_INHERIT_NONE);
|
||||||
usleep(10000); //Fixes ServerKiller not being able to start on single-core machines
|
usleep(10000); //Fixes ServerKiller not being able to start on single-core machines
|
||||||
|
|
||||||
if(ThreadManager::getInstance()->stopAll() > 0){
|
if(ThreadManager::getInstance()->stopAll() > 0){
|
||||||
if(\pocketmine\DEBUG > 1){
|
if(\pocketmine\DEBUG > 1){
|
||||||
echo "Some threads could not be stopped, performing a force-kill" . PHP_EOL . PHP_EOL;
|
echo "Some threads could not be stopped, performing a force-kill" . PHP_EOL . PHP_EOL;
|
||||||
}
|
}
|
||||||
kill(getmypid());
|
Utils::kill(getmypid());
|
||||||
}
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -30,6 +30,9 @@ abstract class Thread extends \Thread{
|
|||||||
|
|
||||||
/** @var \ClassLoader */
|
/** @var \ClassLoader */
|
||||||
protected $classLoader;
|
protected $classLoader;
|
||||||
|
/** @var string|null */
|
||||||
|
protected $composerAutoloaderPath;
|
||||||
|
|
||||||
protected $isKilled = false;
|
protected $isKilled = false;
|
||||||
|
|
||||||
public function getClassLoader(){
|
public function getClassLoader(){
|
||||||
@ -37,6 +40,8 @@ abstract class Thread extends \Thread{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function setClassLoader(\ClassLoader $loader = null){
|
public function setClassLoader(\ClassLoader $loader = null){
|
||||||
|
$this->composerAutoloaderPath = \pocketmine\COMPOSER_AUTOLOADER_PATH;
|
||||||
|
|
||||||
if($loader === null){
|
if($loader === null){
|
||||||
$loader = Server::getInstance()->getLoader();
|
$loader = Server::getInstance()->getLoader();
|
||||||
}
|
}
|
||||||
@ -51,10 +56,8 @@ abstract class Thread extends \Thread{
|
|||||||
* (unless you are using a custom autoloader).
|
* (unless you are using a custom autoloader).
|
||||||
*/
|
*/
|
||||||
public function registerClassLoader(){
|
public function registerClassLoader(){
|
||||||
require(\pocketmine\PATH . "vendor/autoload.php");
|
if($this->composerAutoloaderPath !== null){
|
||||||
if(!interface_exists("ClassLoader", false)){
|
require $this->composerAutoloaderPath;
|
||||||
require(\pocketmine\PATH . "src/spl/ClassLoader.php");
|
|
||||||
require(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
|
|
||||||
}
|
}
|
||||||
if($this->classLoader !== null){
|
if($this->classLoader !== null){
|
||||||
$this->classLoader->register(false);
|
$this->classLoader->register(false);
|
||||||
@ -64,14 +67,10 @@ abstract class Thread extends \Thread{
|
|||||||
public function start(?int $options = \PTHREADS_INHERIT_ALL){
|
public function start(?int $options = \PTHREADS_INHERIT_ALL){
|
||||||
ThreadManager::getInstance()->add($this);
|
ThreadManager::getInstance()->add($this);
|
||||||
|
|
||||||
if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated()){
|
if($this->getClassLoader() === null){
|
||||||
if($this->getClassLoader() === null){
|
$this->setClassLoader();
|
||||||
$this->setClassLoader();
|
|
||||||
}
|
|
||||||
return parent::start($options);
|
|
||||||
}
|
}
|
||||||
|
return parent::start($options);
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -80,12 +79,9 @@ abstract class Thread extends \Thread{
|
|||||||
public function quit(){
|
public function quit(){
|
||||||
$this->isKilled = true;
|
$this->isKilled = true;
|
||||||
|
|
||||||
$this->notify();
|
|
||||||
|
|
||||||
if(!$this->isJoined()){
|
if(!$this->isJoined()){
|
||||||
if(!$this->isTerminated()){
|
$this->notify();
|
||||||
$this->join();
|
$this->join();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ThreadManager::getInstance()->remove($this);
|
ThreadManager::getInstance()->remove($this);
|
||||||
|
@ -89,4 +89,4 @@ class ThreadManager extends \Volatile{
|
|||||||
|
|
||||||
return $erroredThreads;
|
return $erroredThreads;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -30,6 +30,8 @@ abstract class Worker extends \Worker{
|
|||||||
|
|
||||||
/** @var \ClassLoader */
|
/** @var \ClassLoader */
|
||||||
protected $classLoader;
|
protected $classLoader;
|
||||||
|
/** @var string|null */
|
||||||
|
protected $composerAutoloaderPath;
|
||||||
|
|
||||||
protected $isKilled = false;
|
protected $isKilled = false;
|
||||||
|
|
||||||
@ -38,6 +40,8 @@ abstract class Worker extends \Worker{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function setClassLoader(\ClassLoader $loader = null){
|
public function setClassLoader(\ClassLoader $loader = null){
|
||||||
|
$this->composerAutoloaderPath = \pocketmine\COMPOSER_AUTOLOADER_PATH;
|
||||||
|
|
||||||
if($loader === null){
|
if($loader === null){
|
||||||
$loader = Server::getInstance()->getLoader();
|
$loader = Server::getInstance()->getLoader();
|
||||||
}
|
}
|
||||||
@ -52,10 +56,8 @@ abstract class Worker extends \Worker{
|
|||||||
* (unless you are using a custom autoloader).
|
* (unless you are using a custom autoloader).
|
||||||
*/
|
*/
|
||||||
public function registerClassLoader(){
|
public function registerClassLoader(){
|
||||||
require(\pocketmine\PATH . "vendor/autoload.php");
|
if($this->composerAutoloaderPath !== null){
|
||||||
if(!interface_exists("ClassLoader", false)){
|
require $this->composerAutoloaderPath;
|
||||||
require(\pocketmine\PATH . "src/spl/ClassLoader.php");
|
|
||||||
require(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
|
|
||||||
}
|
}
|
||||||
if($this->classLoader !== null){
|
if($this->classLoader !== null){
|
||||||
$this->classLoader->register(false);
|
$this->classLoader->register(false);
|
||||||
@ -65,14 +67,10 @@ abstract class Worker extends \Worker{
|
|||||||
public function start(?int $options = \PTHREADS_INHERIT_ALL){
|
public function start(?int $options = \PTHREADS_INHERIT_ALL){
|
||||||
ThreadManager::getInstance()->add($this);
|
ThreadManager::getInstance()->add($this);
|
||||||
|
|
||||||
if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated()){
|
if($this->getClassLoader() === null){
|
||||||
if($this->getClassLoader() === null){
|
$this->setClassLoader();
|
||||||
$this->setClassLoader();
|
|
||||||
}
|
|
||||||
return parent::start($options);
|
|
||||||
}
|
}
|
||||||
|
return parent::start($options);
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -81,16 +79,10 @@ abstract class Worker extends \Worker{
|
|||||||
public function quit(){
|
public function quit(){
|
||||||
$this->isKilled = true;
|
$this->isKilled = true;
|
||||||
|
|
||||||
$this->notify();
|
|
||||||
|
|
||||||
if($this->isRunning()){
|
if($this->isRunning()){
|
||||||
$this->shutdown();
|
while($this->unstack() !== null);
|
||||||
$this->notify();
|
$this->notify();
|
||||||
$this->unstack();
|
$this->shutdown();
|
||||||
}elseif(!$this->isJoined()){
|
|
||||||
if(!$this->isTerminated()){
|
|
||||||
$this->join();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ThreadManager::getInstance()->remove($this);
|
ThreadManager::getInstance()->remove($this);
|
||||||
|
@ -33,7 +33,6 @@ use pocketmine\math\AxisAlignedBB;
|
|||||||
class Air extends Transparent{
|
class Air extends Transparent{
|
||||||
|
|
||||||
protected $id = self::AIR;
|
protected $id = self::AIR;
|
||||||
protected $meta = 0;
|
|
||||||
|
|
||||||
public function __construct(int $meta = 0){
|
public function __construct(int $meta = 0){
|
||||||
$this->meta = $meta;
|
$this->meta = $meta;
|
||||||
@ -82,5 +81,4 @@ class Air extends Transparent{
|
|||||||
public function getBlastResistance() : float{
|
public function getBlastResistance() : float{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
@ -25,17 +25,16 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\inventory\AnvilInventory;
|
use pocketmine\inventory\AnvilInventory;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
use pocketmine\math\AxisAlignedBB;
|
use pocketmine\math\AxisAlignedBB;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
|
|
||||||
class Anvil extends Fallable{
|
class Anvil extends Fallable{
|
||||||
|
|
||||||
const TYPE_NORMAL = 0;
|
public const TYPE_NORMAL = 0;
|
||||||
const TYPE_SLIGHTLY_DAMAGED = 4;
|
public const TYPE_SLIGHTLY_DAMAGED = 4;
|
||||||
const TYPE_VERY_DAMAGED = 8;
|
public const TYPE_VERY_DAMAGED = 8;
|
||||||
|
|
||||||
protected $id = self::ANVIL;
|
protected $id = self::ANVIL;
|
||||||
|
|
||||||
@ -55,17 +54,25 @@ class Anvil extends Fallable{
|
|||||||
return 6000;
|
return 6000;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getVariantBitmask() : int{
|
||||||
|
return 0x0c;
|
||||||
|
}
|
||||||
|
|
||||||
public function getName() : string{
|
public function getName() : string{
|
||||||
static $names = [
|
static $names = [
|
||||||
self::TYPE_NORMAL => "Anvil",
|
self::TYPE_NORMAL => "Anvil",
|
||||||
self::TYPE_SLIGHTLY_DAMAGED => "Slightly Damaged Anvil",
|
self::TYPE_SLIGHTLY_DAMAGED => "Slightly Damaged Anvil",
|
||||||
self::TYPE_VERY_DAMAGED => "Very Damaged Anvil"
|
self::TYPE_VERY_DAMAGED => "Very Damaged Anvil"
|
||||||
];
|
];
|
||||||
return $names[$this->meta & 0x0c] ?? "Anvil";
|
return $names[$this->getVariant()] ?? "Anvil";
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function recalculateBoundingBox() : ?AxisAlignedBB{
|
public function recalculateBoundingBox() : ?AxisAlignedBB{
|
||||||
@ -100,19 +107,9 @@ class Anvil extends Fallable{
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
$direction = ($player !== null ? $player->getDirection() : 0) & 0x03;
|
$direction = ($player !== null ? $player->getDirection() : 0) & 0x03;
|
||||||
$this->meta = ($this->meta & 0x0c) | $direction;
|
$this->meta = $this->getVariant() | $direction;
|
||||||
return $this->getLevel()->setBlock($blockReplace, $this, true, true);
|
return $this->getLevel()->setBlock($blockReplace, $this, true, true);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public function getDrops(Item $item) : array{
|
|
||||||
if($item->isPickaxe() >= Tool::TIER_WOODEN){
|
|
||||||
return [
|
|
||||||
ItemFactory::get($this->getItemId(), $this->getDamage() & 0x0c, 1)
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -23,9 +23,9 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\event\TranslationContainer;
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\ItemFactory;
|
||||||
|
use pocketmine\lang\TranslationContainer;
|
||||||
use pocketmine\level\Level;
|
use pocketmine\level\Level;
|
||||||
use pocketmine\math\AxisAlignedBB;
|
use pocketmine\math\AxisAlignedBB;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
@ -35,8 +35,8 @@ use pocketmine\tile\Tile;
|
|||||||
use pocketmine\utils\TextFormat;
|
use pocketmine\utils\TextFormat;
|
||||||
|
|
||||||
class Bed extends Transparent{
|
class Bed extends Transparent{
|
||||||
const BITFLAG_OCCUPIED = 0x04;
|
public const BITFLAG_OCCUPIED = 0x04;
|
||||||
const BITFLAG_HEAD = 0x08;
|
public const BITFLAG_HEAD = 0x08;
|
||||||
|
|
||||||
protected $id = self::BED_BLOCK;
|
protected $id = self::BED_BLOCK;
|
||||||
|
|
||||||
@ -85,7 +85,7 @@ class Bed extends Transparent{
|
|||||||
|
|
||||||
$this->getLevel()->setBlock($this, $this, false, false);
|
$this->getLevel()->setBlock($this, $this, false, false);
|
||||||
|
|
||||||
if(($other = $this->getOtherHalf()) !== null and !$other->isOccupied()){
|
if(($other = $this->getOtherHalf()) !== null and $other->isOccupied() !== $occupied){
|
||||||
$other->setOccupied($occupied);
|
$other->setOccupied($occupied);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -142,7 +142,7 @@ class Bed extends Transparent{
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}elseif($player->distanceSquared($this) > 4 and $player->distanceSquared($other) > 4){
|
}elseif($player->distanceSquared($this) > 4 and $player->distanceSquared($other) > 4){
|
||||||
//MCPE doesn't have messages for bed too far away
|
$player->sendMessage(new TranslationContainer(TextFormat::GRAY . "%tile.bed.tooFar"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -171,12 +171,12 @@ class Bed extends Transparent{
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
$down = $this->getSide(Vector3::SIDE_DOWN);
|
$down = $this->getSide(Vector3::SIDE_DOWN);
|
||||||
if(!$down->isTransparent()){
|
if(!$down->isTransparent()){
|
||||||
$meta = (($player instanceof Player ? $player->getDirection() : 0) - 1) & 0x03;
|
$meta = (($player instanceof Player ? $player->getDirection() : 0) - 1) & 0x03;
|
||||||
$next = $this->getSide(self::getOtherHalfSide($meta));
|
$next = $this->getSide(self::getOtherHalfSide($meta));
|
||||||
if($next->canBeReplaced() === true and !$next->getSide(Vector3::SIDE_DOWN)->isTransparent()){
|
if($next->canBeReplaced() and !$next->getSide(Vector3::SIDE_DOWN)->isTransparent()){
|
||||||
$this->getLevel()->setBlock($blockReplace, BlockFactory::get($this->id, $meta), true, true);
|
$this->getLevel()->setBlock($blockReplace, BlockFactory::get($this->id, $meta), true, true);
|
||||||
$this->getLevel()->setBlock($next, BlockFactory::get($this->id, $meta | self::BITFLAG_HEAD), true, true);
|
$this->getLevel()->setBlock($next, BlockFactory::get($this->id, $meta | self::BITFLAG_HEAD), true, true);
|
||||||
|
|
||||||
@ -190,25 +190,16 @@ class Bed extends Transparent{
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onBreak(Item $item, Player $player = null) : bool{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true, true);
|
|
||||||
if(($other = $this->getOtherHalf()) !== null){
|
|
||||||
$this->getLevel()->useBreakOn($other, $item, null, $player !== null); //make sure tiles get removed
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
|
||||||
if($this->isHeadPart()){
|
if($this->isHeadPart()){
|
||||||
$tile = $this->getLevel()->getTile($this);
|
$tile = $this->getLevel()->getTile($this);
|
||||||
if($tile instanceof TileBed){
|
if($tile instanceof TileBed){
|
||||||
return [
|
return [
|
||||||
ItemFactory::get($this->getItemId(), $tile->getColor(), 1)
|
ItemFactory::get($this->getItemId(), $tile->getColor())
|
||||||
];
|
];
|
||||||
}else{
|
}else{
|
||||||
return [
|
return [
|
||||||
ItemFactory::get($this->getItemId(), 14, 1) //Red
|
ItemFactory::get($this->getItemId(), 14) //Red
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -216,4 +207,15 @@ class Bed extends Transparent{
|
|||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function isAffectedBySilkTouch() : bool{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getAffectedBlocks() : array{
|
||||||
|
if(($other = $this->getOtherHalf()) !== null){
|
||||||
|
return [$this, $other];
|
||||||
|
}
|
||||||
|
|
||||||
|
return parent::getAffectedBlocks();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -48,5 +48,4 @@ class Bedrock extends Solid{
|
|||||||
public function isBreakable(Item $item) : bool{
|
public function isBreakable(Item $item) : bool{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
@ -38,16 +38,20 @@ class Beetroot extends Crops{
|
|||||||
return "Beetroot Block";
|
return "Beetroot Block";
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
if($this->meta >= 0x07){
|
if($this->meta >= 0x07){
|
||||||
return [
|
return [
|
||||||
ItemFactory::get(Item::BEETROOT, 0, 1),
|
ItemFactory::get(Item::BEETROOT),
|
||||||
ItemFactory::get(Item::BEETROOT_SEEDS, 0, mt_rand(0, 3))
|
ItemFactory::get(Item::BEETROOT_SEEDS, 0, mt_rand(0, 3))
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
ItemFactory::get(Item::BEETROOT_SEEDS, 0, 1)
|
ItemFactory::get(Item::BEETROOT_SEEDS)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function getPickedItem() : Item{
|
||||||
|
return ItemFactory::get(Item::BEETROOT_SEEDS);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -27,13 +27,12 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\entity\Entity;
|
use pocketmine\entity\Entity;
|
||||||
|
use pocketmine\item\enchantment\Enchantment;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\ItemFactory;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\level\MovingObjectPosition;
|
|
||||||
use pocketmine\level\Position;
|
use pocketmine\level\Position;
|
||||||
use pocketmine\math\AxisAlignedBB;
|
use pocketmine\math\AxisAlignedBB;
|
||||||
|
use pocketmine\math\RayTraceResult;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\metadata\Metadatable;
|
use pocketmine\metadata\Metadatable;
|
||||||
use pocketmine\metadata\MetadataValue;
|
use pocketmine\metadata\MetadataValue;
|
||||||
@ -67,7 +66,7 @@ class Block extends Position implements BlockIds, Metadatable{
|
|||||||
protected $itemId;
|
protected $itemId;
|
||||||
|
|
||||||
/** @var AxisAlignedBB */
|
/** @var AxisAlignedBB */
|
||||||
public $boundingBox = null;
|
protected $boundingBox = null;
|
||||||
|
|
||||||
|
|
||||||
/** @var AxisAlignedBB[]|null */
|
/** @var AxisAlignedBB[]|null */
|
||||||
@ -175,12 +174,12 @@ class Block extends Position implements BlockIds, Metadatable{
|
|||||||
* @param Block $blockReplace
|
* @param Block $blockReplace
|
||||||
* @param Block $blockClicked
|
* @param Block $blockClicked
|
||||||
* @param int $face
|
* @param int $face
|
||||||
* @param Vector3 $facePos
|
* @param Vector3 $clickVector
|
||||||
* @param Player|null $player
|
* @param Player|null $player
|
||||||
*
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
return $this->getLevel()->setBlock($this, $this, true, true);
|
return $this->getLevel()->setBlock($this, $this, true, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -195,8 +194,49 @@ class Block extends Position implements BlockIds, Metadatable{
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function canBeBrokenWith(Item $item) : bool{
|
/**
|
||||||
return $this->getHardness() !== -1;
|
* @return int
|
||||||
|
*/
|
||||||
|
public function getToolType() : int{
|
||||||
|
return BlockToolType::TYPE_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the level of tool required to harvest this block (for normal blocks). When the tool type matches the
|
||||||
|
* block's required tool type, the tool must have a harvest level greater than or equal to this value to be able to
|
||||||
|
* successfully harvest the block.
|
||||||
|
*
|
||||||
|
* If the block requires a specific minimum tier of tiered tool, the minimum tier required should be returned.
|
||||||
|
* Otherwise, 1 should be returned if a tool is required, 0 if not.
|
||||||
|
*
|
||||||
|
* @see Item::getBlockToolHarvestLevel()
|
||||||
|
*
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether the specified item is the proper tool to use for breaking this block. This checks tool type and
|
||||||
|
* harvest level requirement.
|
||||||
|
*
|
||||||
|
* In most cases this is also used to determine whether block drops should be created or not, except in some
|
||||||
|
* special cases such as vines.
|
||||||
|
*
|
||||||
|
* @param Item $tool
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function isCompatibleWithTool(Item $tool) : bool{
|
||||||
|
if($this->getHardness() < 0){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$toolType = $this->getToolType();
|
||||||
|
$harvestLevel = $this->getToolHarvestLevel();
|
||||||
|
return $toolType === BlockToolType::TYPE_NONE or $harvestLevel === 0 or (
|
||||||
|
($toolType & $tool->getBlockToolType()) !== 0 and $tool->getBlockToolHarvestLevel() >= $harvestLevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -220,44 +260,29 @@ class Block extends Position implements BlockIds, Metadatable{
|
|||||||
* @return float
|
* @return float
|
||||||
*/
|
*/
|
||||||
public function getBreakTime(Item $item) : float{
|
public function getBreakTime(Item $item) : float{
|
||||||
$base = $this->getHardness() * 1.5;
|
$base = $this->getHardness();
|
||||||
if($this->canBeBrokenWith($item)){
|
if($this->isCompatibleWithTool($item)){
|
||||||
if($this->getToolType() === Tool::TYPE_SHEARS and $item->isShears()){
|
$base *= 1.5;
|
||||||
$base /= 15;
|
|
||||||
}elseif(
|
|
||||||
($this->getToolType() === Tool::TYPE_PICKAXE and ($tier = $item->isPickaxe()) !== false) or
|
|
||||||
($this->getToolType() === Tool::TYPE_AXE and ($tier = $item->isAxe()) !== false) or
|
|
||||||
($this->getToolType() === Tool::TYPE_SHOVEL and ($tier = $item->isShovel()) !== false)
|
|
||||||
){
|
|
||||||
switch($tier){
|
|
||||||
case Tool::TIER_WOODEN:
|
|
||||||
$base /= 2;
|
|
||||||
break;
|
|
||||||
case Tool::TIER_STONE:
|
|
||||||
$base /= 4;
|
|
||||||
break;
|
|
||||||
case Tool::TIER_IRON:
|
|
||||||
$base /= 6;
|
|
||||||
break;
|
|
||||||
case Tool::TIER_DIAMOND:
|
|
||||||
$base /= 8;
|
|
||||||
break;
|
|
||||||
case Tool::TIER_GOLD:
|
|
||||||
$base /= 12;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}else{
|
}else{
|
||||||
$base *= 3.33;
|
$base *= 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($item->isSword()){
|
$efficiency = $item->getMiningEfficiency($this);
|
||||||
$base *= 0.5;
|
if($efficiency <= 0){
|
||||||
|
throw new \RuntimeException("Item efficiency is invalid");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$base /= $efficiency;
|
||||||
|
|
||||||
return $base;
|
return $base;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when this block or a block immediately adjacent to it changes state.
|
||||||
|
*/
|
||||||
|
public function onNearbyBlockChange() : void{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns whether random block updates will be done on this block.
|
* Returns whether random block updates will be done on this block.
|
||||||
@ -269,14 +294,18 @@ class Block extends Position implements BlockIds, Metadatable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fires a block update on the Block
|
* Called when this block is randomly updated due to chunk ticking.
|
||||||
*
|
* WARNING: This will not be called if ticksRandomly() does not return true!
|
||||||
* @param int $type
|
|
||||||
*
|
|
||||||
* @return bool|int
|
|
||||||
*/
|
*/
|
||||||
public function onUpdate(int $type){
|
public function onRandomTick() : void{
|
||||||
return false;
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when this block is updated by the delayed blockupdate scheduler in the level.
|
||||||
|
*/
|
||||||
|
public function onScheduledUpdate() : void{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -299,14 +328,6 @@ class Block extends Position implements BlockIds, Metadatable{
|
|||||||
return 10;
|
return 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated
|
|
||||||
* @return float
|
|
||||||
*/
|
|
||||||
public function getResistance() : float{
|
|
||||||
return $this->getBlastResistance();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the block's resistance to explosions. Usually 5x hardness.
|
* Returns the block's resistance to explosions. Usually 5x hardness.
|
||||||
* @return float
|
* @return float
|
||||||
@ -315,13 +336,6 @@ class Block extends Position implements BlockIds, Metadatable{
|
|||||||
return $this->getHardness() * 5;
|
return $this->getHardness() * 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
public function getToolType() : int{
|
|
||||||
return Tool::TYPE_NONE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return float
|
* @return float
|
||||||
*/
|
*/
|
||||||
@ -420,11 +434,85 @@ class Block extends Position implements BlockIds, Metadatable{
|
|||||||
* @return Item[]
|
* @return Item[]
|
||||||
*/
|
*/
|
||||||
public function getDrops(Item $item) : array{
|
public function getDrops(Item $item) : array{
|
||||||
|
if($this->isCompatibleWithTool($item)){
|
||||||
|
if($this->isAffectedBySilkTouch() and $item->hasEnchantment(Enchantment::SILK_TOUCH)){
|
||||||
|
return $this->getSilkTouchDrops($item);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->getDropsForCompatibleTool($item);
|
||||||
|
}
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an array of Items to be dropped when the block is broken using the correct tool type.
|
||||||
|
*
|
||||||
|
* @param Item $item
|
||||||
|
*
|
||||||
|
* @return Item[]
|
||||||
|
*/
|
||||||
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [
|
return [
|
||||||
ItemFactory::get($this->getItemId(), $this->getVariant(), 1)
|
ItemFactory::get($this->getItemId(), $this->getVariant())
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns an array of Items to be dropped when the block is broken using a compatible Silk Touch-enchanted tool.
|
||||||
|
*
|
||||||
|
* @param Item $item
|
||||||
|
*
|
||||||
|
* @return Item[]
|
||||||
|
*/
|
||||||
|
public function getSilkTouchDrops(Item $item) : array{
|
||||||
|
return [
|
||||||
|
ItemFactory::get($this->getItemId(), $this->getVariant())
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns how much XP will be dropped by breaking this block with the given item.
|
||||||
|
*
|
||||||
|
* @param Item $item
|
||||||
|
*
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public function getXpDropForTool(Item $item) : int{
|
||||||
|
if($item->hasEnchantment(Enchantment::SILK_TOUCH) or !$this->isCompatibleWithTool($item)){
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->getXpDropAmount();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns how much XP this block will drop when broken with an appropriate tool.
|
||||||
|
*
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
protected function getXpDropAmount() : int{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether Silk Touch enchanted tools will cause this block to drop as itself. Since most blocks drop
|
||||||
|
* themselves anyway, this is implicitly true.
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function isAffectedBySilkTouch() : bool{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the item that players will equip when middle-clicking on this block.
|
||||||
|
* @return Item
|
||||||
|
*/
|
||||||
|
public function getPickedItem() : Item{
|
||||||
|
return ItemFactory::get($this->getItemId(), $this->getVariant());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the time in ticks which the block will fuel a furnace for.
|
* Returns the time in ticks which the block will fuel a furnace for.
|
||||||
* @return int
|
* @return int
|
||||||
@ -434,14 +522,58 @@ class Block extends Position implements BlockIds, Metadatable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the Block on the side $side, works like Vector3::side()
|
* Returns the chance that the block will catch fire from nearby fire sources. Higher values lead to faster catching
|
||||||
|
* fire.
|
||||||
|
*
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public function getFlameEncouragement() : int{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the base flammability of this block. Higher values lead to the block burning away more quickly.
|
||||||
|
*
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public function getFlammability() : int{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether fire lit on this block will burn indefinitely.
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function burnsForever() : bool{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether this block can catch fire.
|
||||||
|
*
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
public function isFlammable() : bool{
|
||||||
|
return $this->getFlammability() > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when this block is burned away by being on fire.
|
||||||
|
*/
|
||||||
|
public function onIncinerate() : void{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the Block on the side $side, works like Vector3::getSide()
|
||||||
*
|
*
|
||||||
* @param int $side
|
* @param int $side
|
||||||
* @param int $step
|
* @param int $step
|
||||||
*
|
*
|
||||||
* @return Block
|
* @return Block
|
||||||
*/
|
*/
|
||||||
public function getSide($side, $step = 1){
|
public function getSide(int $side, int $step = 1){
|
||||||
if($this->isValid()){
|
if($this->isValid()){
|
||||||
return $this->getLevel()->getBlock(Vector3::getSide($side, $step));
|
return $this->getLevel()->getBlock(Vector3::getSide($side, $step));
|
||||||
}
|
}
|
||||||
@ -478,6 +610,16 @@ class Block extends Position implements BlockIds, Metadatable{
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a list of blocks that this block is part of. In most cases, only contains the block itself, but in cases
|
||||||
|
* such as double plants, beds and doors, will contain both halves.
|
||||||
|
*
|
||||||
|
* @return Block[]
|
||||||
|
*/
|
||||||
|
public function getAffectedBlocks() : array{
|
||||||
|
return [$this];
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
@ -493,9 +635,7 @@ class Block extends Position implements BlockIds, Metadatable{
|
|||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function collidesWithBB(AxisAlignedBB $bb) : bool{
|
public function collidesWithBB(AxisAlignedBB $bb) : bool{
|
||||||
$bbs = $this->getCollisionBoxes();
|
foreach($this->getCollisionBoxes() as $bb2){
|
||||||
|
|
||||||
foreach($bbs as $bb2){
|
|
||||||
if($bb->intersectsWith($bb2)){
|
if($bb->intersectsWith($bb2)){
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -558,10 +698,10 @@ class Block extends Position implements BlockIds, Metadatable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clears any cached precomputed bounding boxes. This is called on block neighbour update and when the block is set
|
* Clears any cached precomputed objects, such as bounding boxes. This is called on block neighbour update and when
|
||||||
* into the world to remove any outdated precomputed AABBs and force recalculation.
|
* the block is set into the world to remove any outdated precomputed things such as AABBs and force recalculation.
|
||||||
*/
|
*/
|
||||||
public function clearBoundingBoxes() : void{
|
public function clearCaches() : void{
|
||||||
$this->boundingBox = null;
|
$this->boundingBox = null;
|
||||||
$this->collisionBoxes = null;
|
$this->collisionBoxes = null;
|
||||||
}
|
}
|
||||||
@ -570,15 +710,15 @@ class Block extends Position implements BlockIds, Metadatable{
|
|||||||
* @param Vector3 $pos1
|
* @param Vector3 $pos1
|
||||||
* @param Vector3 $pos2
|
* @param Vector3 $pos2
|
||||||
*
|
*
|
||||||
* @return MovingObjectPosition|null
|
* @return RayTraceResult|null
|
||||||
*/
|
*/
|
||||||
public function calculateIntercept(Vector3 $pos1, Vector3 $pos2) : ?MovingObjectPosition{
|
public function calculateIntercept(Vector3 $pos1, Vector3 $pos2) : ?RayTraceResult{
|
||||||
$bbs = $this->getCollisionBoxes();
|
$bbs = $this->getCollisionBoxes();
|
||||||
if(empty($bbs)){
|
if(empty($bbs)){
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @var MovingObjectPosition|null $currentHit */
|
/** @var RayTraceResult|null $currentHit */
|
||||||
$currentHit = null;
|
$currentHit = null;
|
||||||
/** @var int|float $currentDistance */
|
/** @var int|float $currentDistance */
|
||||||
$currentDistance = PHP_INT_MAX;
|
$currentDistance = PHP_INT_MAX;
|
||||||
@ -596,40 +736,34 @@ class Block extends Position implements BlockIds, Metadatable{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($currentHit !== null){
|
|
||||||
$currentHit->blockX = $this->x;
|
|
||||||
$currentHit->blockY = $this->y;
|
|
||||||
$currentHit->blockZ = $this->z;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $currentHit;
|
return $currentHit;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setMetadata(string $metadataKey, MetadataValue $newMetadataValue){
|
public function setMetadata(string $metadataKey, MetadataValue $newMetadataValue){
|
||||||
if($this->getLevel() instanceof Level){
|
if($this->isValid()){
|
||||||
$this->getLevel()->getBlockMetadata()->setMetadata($this, $metadataKey, $newMetadataValue);
|
$this->level->getBlockMetadata()->setMetadata($this, $metadataKey, $newMetadataValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getMetadata(string $metadataKey){
|
public function getMetadata(string $metadataKey){
|
||||||
if($this->getLevel() instanceof Level){
|
if($this->isValid()){
|
||||||
return $this->getLevel()->getBlockMetadata()->getMetadata($this, $metadataKey);
|
return $this->level->getBlockMetadata()->getMetadata($this, $metadataKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function hasMetadata(string $metadataKey) : bool{
|
public function hasMetadata(string $metadataKey) : bool{
|
||||||
if($this->getLevel() instanceof Level){
|
if($this->isValid()){
|
||||||
return $this->getLevel()->getBlockMetadata()->hasMetadata($this, $metadataKey);
|
return $this->level->getBlockMetadata()->hasMetadata($this, $metadataKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function removeMetadata(string $metadataKey, Plugin $owningPlugin){
|
public function removeMetadata(string $metadataKey, Plugin $owningPlugin){
|
||||||
if($this->getLevel() instanceof Level){
|
if($this->isValid()){
|
||||||
$this->getLevel()->getBlockMetadata()->removeMetadata($this, $metadataKey, $owningPlugin);
|
$this->level->getBlockMetadata()->removeMetadata($this, $metadataKey, $owningPlugin);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -30,8 +30,6 @@ use pocketmine\level\Position;
|
|||||||
* Manages block registration and instance creation
|
* Manages block registration and instance creation
|
||||||
*/
|
*/
|
||||||
class BlockFactory{
|
class BlockFactory{
|
||||||
/** @var \SplFixedArray<Block> */
|
|
||||||
private static $list = null;
|
|
||||||
/** @var \SplFixedArray<Block> */
|
/** @var \SplFixedArray<Block> */
|
||||||
private static $fullList = null;
|
private static $fullList = null;
|
||||||
|
|
||||||
@ -50,280 +48,284 @@ class BlockFactory{
|
|||||||
/** @var \SplFixedArray<float> */
|
/** @var \SplFixedArray<float> */
|
||||||
public static $blastResistance = null;
|
public static $blastResistance = null;
|
||||||
|
|
||||||
|
/** @var int[] */
|
||||||
|
public static $staticRuntimeIdMap = [];
|
||||||
|
|
||||||
|
/** @var int[] */
|
||||||
|
public static $legacyIdMap = [];
|
||||||
|
|
||||||
|
/** @var int */
|
||||||
|
private static $lastRuntimeId = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes the block factory. By default this is called only once on server start, however you may wish to use
|
* Initializes the block factory. By default this is called only once on server start, however you may wish to use
|
||||||
* this if you need to reset the block factory back to its original defaults for whatever reason.
|
* this if you need to reset the block factory back to its original defaults for whatever reason.
|
||||||
*
|
|
||||||
* @param bool $force
|
|
||||||
*/
|
*/
|
||||||
public static function init(bool $force = false) : void{
|
public static function init() : void{
|
||||||
if(self::$list === null or $force){
|
self::$fullList = new \SplFixedArray(4096);
|
||||||
self::$list = new \SplFixedArray(256);
|
|
||||||
self::$fullList = new \SplFixedArray(4096);
|
|
||||||
|
|
||||||
self::$light = new \SplFixedArray(256);
|
self::$light = new \SplFixedArray(256);
|
||||||
self::$lightFilter = new \SplFixedArray(256);
|
self::$lightFilter = new \SplFixedArray(256);
|
||||||
self::$solid = new \SplFixedArray(256);
|
self::$solid = new \SplFixedArray(256);
|
||||||
self::$hardness = new \SplFixedArray(256);
|
self::$hardness = new \SplFixedArray(256);
|
||||||
self::$transparent = new \SplFixedArray(256);
|
self::$transparent = new \SplFixedArray(256);
|
||||||
self::$diffusesSkyLight = new \SplFixedArray(256);
|
self::$diffusesSkyLight = new \SplFixedArray(256);
|
||||||
self::$blastResistance = new \SplFixedArray(256);
|
self::$blastResistance = new \SplFixedArray(256);
|
||||||
|
|
||||||
self::registerBlock(new Air());
|
self::registerBlock(new Air());
|
||||||
self::registerBlock(new Stone());
|
self::registerBlock(new Stone());
|
||||||
self::registerBlock(new Grass());
|
self::registerBlock(new Grass());
|
||||||
self::registerBlock(new Dirt());
|
self::registerBlock(new Dirt());
|
||||||
self::registerBlock(new Cobblestone());
|
self::registerBlock(new Cobblestone());
|
||||||
self::registerBlock(new Planks());
|
self::registerBlock(new Planks());
|
||||||
self::registerBlock(new Sapling());
|
self::registerBlock(new Sapling());
|
||||||
self::registerBlock(new Bedrock());
|
self::registerBlock(new Bedrock());
|
||||||
self::registerBlock(new Water());
|
self::registerBlock(new Water());
|
||||||
self::registerBlock(new StillWater());
|
self::registerBlock(new StillWater());
|
||||||
self::registerBlock(new Lava());
|
self::registerBlock(new Lava());
|
||||||
self::registerBlock(new StillLava());
|
self::registerBlock(new StillLava());
|
||||||
self::registerBlock(new Sand());
|
self::registerBlock(new Sand());
|
||||||
self::registerBlock(new Gravel());
|
self::registerBlock(new Gravel());
|
||||||
self::registerBlock(new GoldOre());
|
self::registerBlock(new GoldOre());
|
||||||
self::registerBlock(new IronOre());
|
self::registerBlock(new IronOre());
|
||||||
self::registerBlock(new CoalOre());
|
self::registerBlock(new CoalOre());
|
||||||
self::registerBlock(new Wood());
|
self::registerBlock(new Wood());
|
||||||
self::registerBlock(new Leaves());
|
self::registerBlock(new Leaves());
|
||||||
self::registerBlock(new Sponge());
|
self::registerBlock(new Sponge());
|
||||||
self::registerBlock(new Glass());
|
self::registerBlock(new Glass());
|
||||||
self::registerBlock(new LapisOre());
|
self::registerBlock(new LapisOre());
|
||||||
self::registerBlock(new Lapis());
|
self::registerBlock(new Lapis());
|
||||||
//TODO: DISPENSER
|
//TODO: DISPENSER
|
||||||
self::registerBlock(new Sandstone());
|
self::registerBlock(new Sandstone());
|
||||||
self::registerBlock(new NoteBlock());
|
self::registerBlock(new NoteBlock());
|
||||||
self::registerBlock(new Bed());
|
self::registerBlock(new Bed());
|
||||||
self::registerBlock(new PoweredRail());
|
self::registerBlock(new PoweredRail());
|
||||||
self::registerBlock(new DetectorRail());
|
self::registerBlock(new DetectorRail());
|
||||||
//TODO: STICKY_PISTON
|
//TODO: STICKY_PISTON
|
||||||
self::registerBlock(new Cobweb());
|
self::registerBlock(new Cobweb());
|
||||||
self::registerBlock(new TallGrass());
|
self::registerBlock(new TallGrass());
|
||||||
self::registerBlock(new DeadBush());
|
self::registerBlock(new DeadBush());
|
||||||
//TODO: PISTON
|
//TODO: PISTON
|
||||||
//TODO: PISTONARMCOLLISION
|
//TODO: PISTONARMCOLLISION
|
||||||
self::registerBlock(new Wool());
|
self::registerBlock(new Wool());
|
||||||
|
|
||||||
self::registerBlock(new Dandelion());
|
self::registerBlock(new Dandelion());
|
||||||
self::registerBlock(new Flower());
|
self::registerBlock(new Flower());
|
||||||
self::registerBlock(new BrownMushroom());
|
self::registerBlock(new BrownMushroom());
|
||||||
self::registerBlock(new RedMushroom());
|
self::registerBlock(new RedMushroom());
|
||||||
self::registerBlock(new Gold());
|
self::registerBlock(new Gold());
|
||||||
self::registerBlock(new Iron());
|
self::registerBlock(new Iron());
|
||||||
self::registerBlock(new DoubleStoneSlab());
|
self::registerBlock(new DoubleStoneSlab());
|
||||||
self::registerBlock(new StoneSlab());
|
self::registerBlock(new StoneSlab());
|
||||||
self::registerBlock(new Bricks());
|
self::registerBlock(new Bricks());
|
||||||
self::registerBlock(new TNT());
|
self::registerBlock(new TNT());
|
||||||
self::registerBlock(new Bookshelf());
|
self::registerBlock(new Bookshelf());
|
||||||
self::registerBlock(new MossyCobblestone());
|
self::registerBlock(new MossyCobblestone());
|
||||||
self::registerBlock(new Obsidian());
|
self::registerBlock(new Obsidian());
|
||||||
self::registerBlock(new Torch());
|
self::registerBlock(new Torch());
|
||||||
self::registerBlock(new Fire());
|
self::registerBlock(new Fire());
|
||||||
self::registerBlock(new MonsterSpawner());
|
self::registerBlock(new MonsterSpawner());
|
||||||
self::registerBlock(new WoodenStairs(Block::OAK_STAIRS, 0, "Oak Stairs"));
|
self::registerBlock(new WoodenStairs(Block::OAK_STAIRS, 0, "Oak Stairs"));
|
||||||
self::registerBlock(new Chest());
|
self::registerBlock(new Chest());
|
||||||
//TODO: REDSTONE_WIRE
|
//TODO: REDSTONE_WIRE
|
||||||
self::registerBlock(new DiamondOre());
|
self::registerBlock(new DiamondOre());
|
||||||
self::registerBlock(new Diamond());
|
self::registerBlock(new Diamond());
|
||||||
self::registerBlock(new CraftingTable());
|
self::registerBlock(new CraftingTable());
|
||||||
self::registerBlock(new Wheat());
|
self::registerBlock(new Wheat());
|
||||||
self::registerBlock(new Farmland());
|
self::registerBlock(new Farmland());
|
||||||
self::registerBlock(new Furnace());
|
self::registerBlock(new Furnace());
|
||||||
self::registerBlock(new BurningFurnace());
|
self::registerBlock(new BurningFurnace());
|
||||||
self::registerBlock(new SignPost());
|
self::registerBlock(new SignPost());
|
||||||
self::registerBlock(new WoodenDoor(Block::OAK_DOOR_BLOCK, 0, "Oak Door", Item::OAK_DOOR));
|
self::registerBlock(new WoodenDoor(Block::OAK_DOOR_BLOCK, 0, "Oak Door", Item::OAK_DOOR));
|
||||||
self::registerBlock(new Ladder());
|
self::registerBlock(new Ladder());
|
||||||
self::registerBlock(new Rail());
|
self::registerBlock(new Rail());
|
||||||
self::registerBlock(new CobblestoneStairs());
|
self::registerBlock(new CobblestoneStairs());
|
||||||
self::registerBlock(new WallSign());
|
self::registerBlock(new WallSign());
|
||||||
self::registerBlock(new Lever());
|
self::registerBlock(new Lever());
|
||||||
self::registerBlock(new StonePressurePlate());
|
self::registerBlock(new StonePressurePlate());
|
||||||
self::registerBlock(new IronDoor());
|
self::registerBlock(new IronDoor());
|
||||||
self::registerBlock(new WoodenPressurePlate());
|
self::registerBlock(new WoodenPressurePlate());
|
||||||
self::registerBlock(new RedstoneOre());
|
self::registerBlock(new RedstoneOre());
|
||||||
self::registerBlock(new GlowingRedstoneOre());
|
self::registerBlock(new GlowingRedstoneOre());
|
||||||
self::registerBlock(new RedstoneTorchUnlit());
|
self::registerBlock(new RedstoneTorchUnlit());
|
||||||
self::registerBlock(new RedstoneTorch());
|
self::registerBlock(new RedstoneTorch());
|
||||||
self::registerBlock(new StoneButton());
|
self::registerBlock(new StoneButton());
|
||||||
self::registerBlock(new SnowLayer());
|
self::registerBlock(new SnowLayer());
|
||||||
self::registerBlock(new Ice());
|
self::registerBlock(new Ice());
|
||||||
self::registerBlock(new Snow());
|
self::registerBlock(new Snow());
|
||||||
self::registerBlock(new Cactus());
|
self::registerBlock(new Cactus());
|
||||||
self::registerBlock(new Clay());
|
self::registerBlock(new Clay());
|
||||||
self::registerBlock(new Sugarcane());
|
self::registerBlock(new Sugarcane());
|
||||||
//TODO: JUKEBOX
|
//TODO: JUKEBOX
|
||||||
self::registerBlock(new WoodenFence());
|
self::registerBlock(new WoodenFence());
|
||||||
self::registerBlock(new Pumpkin());
|
self::registerBlock(new Pumpkin());
|
||||||
self::registerBlock(new Netherrack());
|
self::registerBlock(new Netherrack());
|
||||||
self::registerBlock(new SoulSand());
|
self::registerBlock(new SoulSand());
|
||||||
self::registerBlock(new Glowstone());
|
self::registerBlock(new Glowstone());
|
||||||
//TODO: PORTAL
|
//TODO: PORTAL
|
||||||
self::registerBlock(new LitPumpkin());
|
self::registerBlock(new LitPumpkin());
|
||||||
self::registerBlock(new Cake());
|
self::registerBlock(new Cake());
|
||||||
//TODO: REPEATER_BLOCK
|
//TODO: REPEATER_BLOCK
|
||||||
//TODO: POWERED_REPEATER
|
//TODO: POWERED_REPEATER
|
||||||
//TODO: INVISIBLEBEDROCK
|
//TODO: INVISIBLEBEDROCK
|
||||||
self::registerBlock(new Trapdoor());
|
self::registerBlock(new Trapdoor());
|
||||||
//TODO: MONSTER_EGG
|
//TODO: MONSTER_EGG
|
||||||
self::registerBlock(new StoneBricks());
|
self::registerBlock(new StoneBricks());
|
||||||
self::registerBlock(new BrownMushroomBlock());
|
self::registerBlock(new BrownMushroomBlock());
|
||||||
self::registerBlock(new RedMushroomBlock());
|
self::registerBlock(new RedMushroomBlock());
|
||||||
self::registerBlock(new IronBars());
|
self::registerBlock(new IronBars());
|
||||||
self::registerBlock(new GlassPane());
|
self::registerBlock(new GlassPane());
|
||||||
self::registerBlock(new Melon());
|
self::registerBlock(new Melon());
|
||||||
self::registerBlock(new PumpkinStem());
|
self::registerBlock(new PumpkinStem());
|
||||||
self::registerBlock(new MelonStem());
|
self::registerBlock(new MelonStem());
|
||||||
self::registerBlock(new Vine());
|
self::registerBlock(new Vine());
|
||||||
self::registerBlock(new FenceGate(Block::OAK_FENCE_GATE, 0, "Oak Fence Gate"));
|
self::registerBlock(new FenceGate(Block::OAK_FENCE_GATE, 0, "Oak Fence Gate"));
|
||||||
self::registerBlock(new BrickStairs());
|
self::registerBlock(new BrickStairs());
|
||||||
self::registerBlock(new StoneBrickStairs());
|
self::registerBlock(new StoneBrickStairs());
|
||||||
self::registerBlock(new Mycelium());
|
self::registerBlock(new Mycelium());
|
||||||
self::registerBlock(new WaterLily());
|
self::registerBlock(new WaterLily());
|
||||||
self::registerBlock(new NetherBrick(Block::NETHER_BRICK_BLOCK, 0, "Nether Bricks"));
|
self::registerBlock(new NetherBrick(Block::NETHER_BRICK_BLOCK, 0, "Nether Bricks"));
|
||||||
self::registerBlock(new NetherBrickFence());
|
self::registerBlock(new NetherBrickFence());
|
||||||
self::registerBlock(new NetherBrickStairs());
|
self::registerBlock(new NetherBrickStairs());
|
||||||
self::registerBlock(new NetherWartPlant());
|
self::registerBlock(new NetherWartPlant());
|
||||||
self::registerBlock(new EnchantingTable());
|
self::registerBlock(new EnchantingTable());
|
||||||
self::registerBlock(new BrewingStand());
|
self::registerBlock(new BrewingStand());
|
||||||
//TODO: CAULDRON_BLOCK
|
//TODO: CAULDRON_BLOCK
|
||||||
//TODO: END_PORTAL
|
//TODO: END_PORTAL
|
||||||
self::registerBlock(new EndPortalFrame());
|
self::registerBlock(new EndPortalFrame());
|
||||||
self::registerBlock(new EndStone());
|
self::registerBlock(new EndStone());
|
||||||
//TODO: DRAGON_EGG
|
//TODO: DRAGON_EGG
|
||||||
self::registerBlock(new RedstoneLamp());
|
self::registerBlock(new RedstoneLamp());
|
||||||
self::registerBlock(new LitRedstoneLamp());
|
self::registerBlock(new LitRedstoneLamp());
|
||||||
//TODO: DROPPER
|
//TODO: DROPPER
|
||||||
self::registerBlock(new ActivatorRail());
|
self::registerBlock(new ActivatorRail());
|
||||||
self::registerBlock(new CocoaBlock());
|
self::registerBlock(new CocoaBlock());
|
||||||
self::registerBlock(new SandstoneStairs());
|
self::registerBlock(new SandstoneStairs());
|
||||||
self::registerBlock(new EmeraldOre());
|
self::registerBlock(new EmeraldOre());
|
||||||
//TODO: ENDER_CHEST
|
self::registerBlock(new EnderChest());
|
||||||
self::registerBlock(new TripwireHook());
|
self::registerBlock(new TripwireHook());
|
||||||
self::registerBlock(new Tripwire());
|
self::registerBlock(new Tripwire());
|
||||||
self::registerBlock(new Emerald());
|
self::registerBlock(new Emerald());
|
||||||
self::registerBlock(new WoodenStairs(Block::SPRUCE_STAIRS, 0, "Spruce Stairs"));
|
self::registerBlock(new WoodenStairs(Block::SPRUCE_STAIRS, 0, "Spruce Stairs"));
|
||||||
self::registerBlock(new WoodenStairs(Block::BIRCH_STAIRS, 0, "Birch Stairs"));
|
self::registerBlock(new WoodenStairs(Block::BIRCH_STAIRS, 0, "Birch Stairs"));
|
||||||
self::registerBlock(new WoodenStairs(Block::JUNGLE_STAIRS, 0, "Jungle Stairs"));
|
self::registerBlock(new WoodenStairs(Block::JUNGLE_STAIRS, 0, "Jungle Stairs"));
|
||||||
//TODO: COMMAND_BLOCK
|
//TODO: COMMAND_BLOCK
|
||||||
//TODO: BEACON
|
//TODO: BEACON
|
||||||
self::registerBlock(new CobblestoneWall());
|
self::registerBlock(new CobblestoneWall());
|
||||||
self::registerBlock(new FlowerPot());
|
self::registerBlock(new FlowerPot());
|
||||||
self::registerBlock(new Carrot());
|
self::registerBlock(new Carrot());
|
||||||
self::registerBlock(new Potato());
|
self::registerBlock(new Potato());
|
||||||
self::registerBlock(new WoodenButton());
|
self::registerBlock(new WoodenButton());
|
||||||
self::registerBlock(new Skull());
|
self::registerBlock(new Skull());
|
||||||
self::registerBlock(new Anvil());
|
self::registerBlock(new Anvil());
|
||||||
self::registerBlock(new TrappedChest());
|
self::registerBlock(new TrappedChest());
|
||||||
self::registerBlock(new WeightedPressurePlateLight());
|
self::registerBlock(new WeightedPressurePlateLight());
|
||||||
self::registerBlock(new WeightedPressurePlateHeavy());
|
self::registerBlock(new WeightedPressurePlateHeavy());
|
||||||
//TODO: COMPARATOR_BLOCK
|
//TODO: COMPARATOR_BLOCK
|
||||||
//TODO: POWERED_COMPARATOR
|
//TODO: POWERED_COMPARATOR
|
||||||
self::registerBlock(new DaylightSensor());
|
self::registerBlock(new DaylightSensor());
|
||||||
self::registerBlock(new Redstone());
|
self::registerBlock(new Redstone());
|
||||||
self::registerBlock(new NetherQuartzOre());
|
self::registerBlock(new NetherQuartzOre());
|
||||||
//TODO: HOPPER_BLOCK
|
//TODO: HOPPER_BLOCK
|
||||||
self::registerBlock(new Quartz());
|
self::registerBlock(new Quartz());
|
||||||
self::registerBlock(new QuartzStairs());
|
self::registerBlock(new QuartzStairs());
|
||||||
self::registerBlock(new DoubleWoodenSlab());
|
self::registerBlock(new DoubleWoodenSlab());
|
||||||
self::registerBlock(new WoodenSlab());
|
self::registerBlock(new WoodenSlab());
|
||||||
self::registerBlock(new StainedClay());
|
self::registerBlock(new StainedClay());
|
||||||
self::registerBlock(new StainedGlassPane());
|
self::registerBlock(new StainedGlassPane());
|
||||||
self::registerBlock(new Leaves2());
|
self::registerBlock(new Leaves2());
|
||||||
self::registerBlock(new Wood2());
|
self::registerBlock(new Wood2());
|
||||||
self::registerBlock(new WoodenStairs(Block::ACACIA_STAIRS, 0, "Acacia Stairs"));
|
self::registerBlock(new WoodenStairs(Block::ACACIA_STAIRS, 0, "Acacia Stairs"));
|
||||||
self::registerBlock(new WoodenStairs(Block::DARK_OAK_STAIRS, 0, "Dark Oak Stairs"));
|
self::registerBlock(new WoodenStairs(Block::DARK_OAK_STAIRS, 0, "Dark Oak Stairs"));
|
||||||
//TODO: SLIME
|
//TODO: SLIME
|
||||||
|
|
||||||
self::registerBlock(new IronTrapdoor());
|
self::registerBlock(new IronTrapdoor());
|
||||||
self::registerBlock(new Prismarine());
|
self::registerBlock(new Prismarine());
|
||||||
self::registerBlock(new SeaLantern());
|
self::registerBlock(new SeaLantern());
|
||||||
self::registerBlock(new HayBale());
|
self::registerBlock(new HayBale());
|
||||||
self::registerBlock(new Carpet());
|
self::registerBlock(new Carpet());
|
||||||
self::registerBlock(new HardenedClay());
|
self::registerBlock(new HardenedClay());
|
||||||
self::registerBlock(new Coal());
|
self::registerBlock(new Coal());
|
||||||
self::registerBlock(new PackedIce());
|
self::registerBlock(new PackedIce());
|
||||||
self::registerBlock(new DoublePlant());
|
self::registerBlock(new DoublePlant());
|
||||||
//TODO: STANDING_BANNER
|
self::registerBlock(new StandingBanner());
|
||||||
//TODO: WALL_BANNER
|
self::registerBlock(new WallBanner());
|
||||||
//TODO: DAYLIGHT_DETECTOR_INVERTED
|
//TODO: DAYLIGHT_DETECTOR_INVERTED
|
||||||
self::registerBlock(new RedSandstone());
|
self::registerBlock(new RedSandstone());
|
||||||
self::registerBlock(new RedSandstoneStairs());
|
self::registerBlock(new RedSandstoneStairs());
|
||||||
self::registerBlock(new DoubleStoneSlab2());
|
self::registerBlock(new DoubleStoneSlab2());
|
||||||
self::registerBlock(new StoneSlab2());
|
self::registerBlock(new StoneSlab2());
|
||||||
self::registerBlock(new FenceGate(Block::SPRUCE_FENCE_GATE, 0, "Spruce Fence Gate"));
|
self::registerBlock(new FenceGate(Block::SPRUCE_FENCE_GATE, 0, "Spruce Fence Gate"));
|
||||||
self::registerBlock(new FenceGate(Block::BIRCH_FENCE_GATE, 0, "Birch Fence Gate"));
|
self::registerBlock(new FenceGate(Block::BIRCH_FENCE_GATE, 0, "Birch Fence Gate"));
|
||||||
self::registerBlock(new FenceGate(Block::JUNGLE_FENCE_GATE, 0, "Jungle Fence Gate"));
|
self::registerBlock(new FenceGate(Block::JUNGLE_FENCE_GATE, 0, "Jungle Fence Gate"));
|
||||||
self::registerBlock(new FenceGate(Block::DARK_OAK_FENCE_GATE, 0, "Dark Oak Fence Gate"));
|
self::registerBlock(new FenceGate(Block::DARK_OAK_FENCE_GATE, 0, "Dark Oak Fence Gate"));
|
||||||
self::registerBlock(new FenceGate(Block::ACACIA_FENCE_GATE, 0, "Acacia Fence Gate"));
|
self::registerBlock(new FenceGate(Block::ACACIA_FENCE_GATE, 0, "Acacia Fence Gate"));
|
||||||
//TODO: REPEATING_COMMAND_BLOCK
|
//TODO: REPEATING_COMMAND_BLOCK
|
||||||
//TODO: CHAIN_COMMAND_BLOCK
|
//TODO: CHAIN_COMMAND_BLOCK
|
||||||
|
|
||||||
self::registerBlock(new WoodenDoor(Block::SPRUCE_DOOR_BLOCK, 0, "Spruce Door", Item::SPRUCE_DOOR));
|
self::registerBlock(new WoodenDoor(Block::SPRUCE_DOOR_BLOCK, 0, "Spruce Door", Item::SPRUCE_DOOR));
|
||||||
self::registerBlock(new WoodenDoor(Block::BIRCH_DOOR_BLOCK, 0, "Birch Door", Item::BIRCH_DOOR));
|
self::registerBlock(new WoodenDoor(Block::BIRCH_DOOR_BLOCK, 0, "Birch Door", Item::BIRCH_DOOR));
|
||||||
self::registerBlock(new WoodenDoor(Block::JUNGLE_DOOR_BLOCK, 0, "Jungle Door", Item::JUNGLE_DOOR));
|
self::registerBlock(new WoodenDoor(Block::JUNGLE_DOOR_BLOCK, 0, "Jungle Door", Item::JUNGLE_DOOR));
|
||||||
self::registerBlock(new WoodenDoor(Block::ACACIA_DOOR_BLOCK, 0, "Acacia Door", Item::ACACIA_DOOR));
|
self::registerBlock(new WoodenDoor(Block::ACACIA_DOOR_BLOCK, 0, "Acacia Door", Item::ACACIA_DOOR));
|
||||||
self::registerBlock(new WoodenDoor(Block::DARK_OAK_DOOR_BLOCK, 0, "Dark Oak Door", Item::DARK_OAK_DOOR));
|
self::registerBlock(new WoodenDoor(Block::DARK_OAK_DOOR_BLOCK, 0, "Dark Oak Door", Item::DARK_OAK_DOOR));
|
||||||
self::registerBlock(new GrassPath());
|
self::registerBlock(new GrassPath());
|
||||||
self::registerBlock(new ItemFrame());
|
self::registerBlock(new ItemFrame());
|
||||||
//TODO: CHORUS_FLOWER
|
//TODO: CHORUS_FLOWER
|
||||||
self::registerBlock(new Purpur());
|
self::registerBlock(new Purpur());
|
||||||
|
|
||||||
self::registerBlock(new PurpurStairs());
|
self::registerBlock(new PurpurStairs());
|
||||||
|
|
||||||
//TODO: UNDYED_SHULKER_BOX
|
//TODO: UNDYED_SHULKER_BOX
|
||||||
self::registerBlock(new EndStoneBricks());
|
self::registerBlock(new EndStoneBricks());
|
||||||
//TODO: FROSTED_ICE
|
//TODO: FROSTED_ICE
|
||||||
self::registerBlock(new EndRod());
|
self::registerBlock(new EndRod());
|
||||||
//TODO: END_GATEWAY
|
//TODO: END_GATEWAY
|
||||||
|
|
||||||
self::registerBlock(new Magma());
|
self::registerBlock(new Magma());
|
||||||
self::registerBlock(new NetherWartBlock());
|
self::registerBlock(new NetherWartBlock());
|
||||||
self::registerBlock(new NetherBrick(Block::RED_NETHER_BRICK, 0, "Red Nether Bricks"));
|
self::registerBlock(new NetherBrick(Block::RED_NETHER_BRICK, 0, "Red Nether Bricks"));
|
||||||
self::registerBlock(new BoneBlock());
|
self::registerBlock(new BoneBlock());
|
||||||
|
|
||||||
//TODO: SHULKER_BOX
|
//TODO: SHULKER_BOX
|
||||||
self::registerBlock(new GlazedTerracotta(Block::PURPLE_GLAZED_TERRACOTTA, 0, "Purple Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::PURPLE_GLAZED_TERRACOTTA, 0, "Purple Glazed Terracotta"));
|
||||||
self::registerBlock(new GlazedTerracotta(Block::WHITE_GLAZED_TERRACOTTA, 0, "White Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::WHITE_GLAZED_TERRACOTTA, 0, "White Glazed Terracotta"));
|
||||||
self::registerBlock(new GlazedTerracotta(Block::ORANGE_GLAZED_TERRACOTTA, 0, "Orange Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::ORANGE_GLAZED_TERRACOTTA, 0, "Orange Glazed Terracotta"));
|
||||||
self::registerBlock(new GlazedTerracotta(Block::MAGENTA_GLAZED_TERRACOTTA, 0, "Magenta Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::MAGENTA_GLAZED_TERRACOTTA, 0, "Magenta Glazed Terracotta"));
|
||||||
self::registerBlock(new GlazedTerracotta(Block::LIGHT_BLUE_GLAZED_TERRACOTTA, 0, "Light Blue Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::LIGHT_BLUE_GLAZED_TERRACOTTA, 0, "Light Blue Glazed Terracotta"));
|
||||||
self::registerBlock(new GlazedTerracotta(Block::YELLOW_GLAZED_TERRACOTTA, 0, "Yellow Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::YELLOW_GLAZED_TERRACOTTA, 0, "Yellow Glazed Terracotta"));
|
||||||
self::registerBlock(new GlazedTerracotta(Block::LIME_GLAZED_TERRACOTTA, 0, "Lime Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::LIME_GLAZED_TERRACOTTA, 0, "Lime Glazed Terracotta"));
|
||||||
self::registerBlock(new GlazedTerracotta(Block::PINK_GLAZED_TERRACOTTA, 0, "Pink Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::PINK_GLAZED_TERRACOTTA, 0, "Pink Glazed Terracotta"));
|
||||||
self::registerBlock(new GlazedTerracotta(Block::GRAY_GLAZED_TERRACOTTA, 0, "Grey Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::GRAY_GLAZED_TERRACOTTA, 0, "Grey Glazed Terracotta"));
|
||||||
self::registerBlock(new GlazedTerracotta(Block::SILVER_GLAZED_TERRACOTTA, 0, "Light Grey Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::SILVER_GLAZED_TERRACOTTA, 0, "Light Grey Glazed Terracotta"));
|
||||||
self::registerBlock(new GlazedTerracotta(Block::CYAN_GLAZED_TERRACOTTA, 0, "Cyan Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::CYAN_GLAZED_TERRACOTTA, 0, "Cyan Glazed Terracotta"));
|
||||||
|
|
||||||
self::registerBlock(new GlazedTerracotta(Block::BLUE_GLAZED_TERRACOTTA, 0, "Blue Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::BLUE_GLAZED_TERRACOTTA, 0, "Blue Glazed Terracotta"));
|
||||||
self::registerBlock(new GlazedTerracotta(Block::BROWN_GLAZED_TERRACOTTA, 0, "Brown Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::BROWN_GLAZED_TERRACOTTA, 0, "Brown Glazed Terracotta"));
|
||||||
self::registerBlock(new GlazedTerracotta(Block::GREEN_GLAZED_TERRACOTTA, 0, "Green Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::GREEN_GLAZED_TERRACOTTA, 0, "Green Glazed Terracotta"));
|
||||||
self::registerBlock(new GlazedTerracotta(Block::RED_GLAZED_TERRACOTTA, 0, "Red Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::RED_GLAZED_TERRACOTTA, 0, "Red Glazed Terracotta"));
|
||||||
self::registerBlock(new GlazedTerracotta(Block::BLACK_GLAZED_TERRACOTTA, 0, "Black Glazed Terracotta"));
|
self::registerBlock(new GlazedTerracotta(Block::BLACK_GLAZED_TERRACOTTA, 0, "Black Glazed Terracotta"));
|
||||||
self::registerBlock(new Concrete());
|
self::registerBlock(new Concrete());
|
||||||
self::registerBlock(new ConcretePowder());
|
self::registerBlock(new ConcretePowder());
|
||||||
|
|
||||||
//TODO: CHORUS_PLANT
|
//TODO: CHORUS_PLANT
|
||||||
self::registerBlock(new StainedGlass());
|
self::registerBlock(new StainedGlass());
|
||||||
|
|
||||||
self::registerBlock(new Podzol());
|
self::registerBlock(new Podzol());
|
||||||
self::registerBlock(new Beetroot());
|
self::registerBlock(new Beetroot());
|
||||||
self::registerBlock(new Stonecutter());
|
self::registerBlock(new Stonecutter());
|
||||||
self::registerBlock(new GlowingObsidian());
|
self::registerBlock(new GlowingObsidian());
|
||||||
self::registerBlock(new NetherReactor());
|
self::registerBlock(new NetherReactor());
|
||||||
//TODO: INFO_UPDATE
|
//TODO: INFO_UPDATE
|
||||||
//TODO: INFO_UPDATE2
|
//TODO: INFO_UPDATE2
|
||||||
//TODO: MOVINGBLOCK
|
//TODO: MOVINGBLOCK
|
||||||
//TODO: OBSERVER
|
//TODO: OBSERVER
|
||||||
//TODO: STRUCTURE_BLOCK
|
//TODO: STRUCTURE_BLOCK
|
||||||
|
|
||||||
//TODO: RESERVED6
|
//TODO: RESERVED6
|
||||||
|
|
||||||
foreach(self::$list as $id => $block){
|
for($id = 0, $size = self::$fullList->getSize() >> 4; $id < $size; ++$id){
|
||||||
if($block === null){
|
if(self::$fullList[$id << 4] === null){
|
||||||
self::registerBlock(new UnknownBlock($id));
|
self::registerBlock(new UnknownBlock($id));
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -348,8 +350,6 @@ class BlockFactory{
|
|||||||
throw new \RuntimeException("Trying to overwrite an already registered block");
|
throw new \RuntimeException("Trying to overwrite an already registered block");
|
||||||
}
|
}
|
||||||
|
|
||||||
self::$list[$id] = clone $block;
|
|
||||||
|
|
||||||
for($meta = 0; $meta < 16; ++$meta){
|
for($meta = 0; $meta < 16; ++$meta){
|
||||||
$variant = clone $block;
|
$variant = clone $block;
|
||||||
$variant->setDamage($meta);
|
$variant->setDamage($meta);
|
||||||
@ -360,7 +360,7 @@ class BlockFactory{
|
|||||||
self::$transparent[$id] = $block->isTransparent();
|
self::$transparent[$id] = $block->isTransparent();
|
||||||
self::$hardness[$id] = $block->getHardness();
|
self::$hardness[$id] = $block->getHardness();
|
||||||
self::$light[$id] = $block->getLightLevel();
|
self::$light[$id] = $block->getLightLevel();
|
||||||
self::$lightFilter[$id] = $block->getLightFilter() + 1; //opacity plus 1 standard light filter
|
self::$lightFilter[$id] = min(15, $block->getLightFilter() + 1); //opacity plus 1 standard light filter
|
||||||
self::$diffusesSkyLight[$id] = $block->diffusesSkyLight();
|
self::$diffusesSkyLight[$id] = $block->diffusesSkyLight();
|
||||||
self::$blastResistance[$id] = $block->getBlastResistance();
|
self::$blastResistance[$id] = $block->getBlastResistance();
|
||||||
}
|
}
|
||||||
@ -390,9 +390,9 @@ class BlockFactory{
|
|||||||
}
|
}
|
||||||
|
|
||||||
if($pos !== null){
|
if($pos !== null){
|
||||||
$block->x = $pos->x;
|
$block->x = $pos->getFloorX();
|
||||||
$block->y = $pos->y;
|
$block->y = $pos->getFloorY();
|
||||||
$block->z = $pos->z;
|
$block->z = $pos->getFloorZ();
|
||||||
$block->level = $pos->level;
|
$block->level = $pos->level;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -414,7 +414,50 @@ class BlockFactory{
|
|||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public static function isRegistered(int $id) : bool{
|
public static function isRegistered(int $id) : bool{
|
||||||
$b = self::$list[$id];
|
$b = self::$fullList[$id << 4];
|
||||||
return $b !== null and !($b instanceof UnknownBlock);
|
return $b !== null and !($b instanceof UnknownBlock);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public static function registerStaticRuntimeIdMappings() : void{
|
||||||
|
/** @var mixed[] $runtimeIdMap */
|
||||||
|
$runtimeIdMap = json_decode(file_get_contents(\pocketmine\RESOURCE_PATH . "runtimeid_table.json"), true);
|
||||||
|
foreach($runtimeIdMap as $obj){
|
||||||
|
self::registerMapping($obj["runtimeID"], $obj["id"], $obj["data"]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @internal
|
||||||
|
*
|
||||||
|
* @param int $id
|
||||||
|
* @param int $meta
|
||||||
|
*
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public static function toStaticRuntimeId(int $id, int $meta = 0) : int{
|
||||||
|
/*
|
||||||
|
* try id+meta first
|
||||||
|
* if not found, try id+0 (strip meta)
|
||||||
|
* if still not found, return update! block
|
||||||
|
*/
|
||||||
|
return self::$staticRuntimeIdMap[($id << 4) | $meta] ?? self::$staticRuntimeIdMap[$id << 4] ?? self::$staticRuntimeIdMap[BlockIds::INFO_UPDATE << 4];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @internal
|
||||||
|
*
|
||||||
|
* @param int $runtimeId
|
||||||
|
*
|
||||||
|
* @return int[] [id, meta]
|
||||||
|
*/
|
||||||
|
public static function fromStaticRuntimeId(int $runtimeId) : array{
|
||||||
|
$v = self::$legacyIdMap[$runtimeId];
|
||||||
|
return [$v >> 4, $v & 0xf];
|
||||||
|
}
|
||||||
|
|
||||||
|
private static function registerMapping(int $staticRuntimeId, int $legacyId, int $legacyMeta) : void{
|
||||||
|
self::$staticRuntimeIdMap[($legacyId << 4) | $legacyMeta] = $staticRuntimeId;
|
||||||
|
self::$legacyIdMap[$staticRuntimeId] = ($legacyId << 4) | $legacyMeta;
|
||||||
|
self::$lastRuntimeId = max(self::$lastRuntimeId, $staticRuntimeId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -25,255 +25,255 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
interface BlockIds{
|
interface BlockIds{
|
||||||
|
|
||||||
const AIR = 0;
|
public const AIR = 0;
|
||||||
const STONE = 1;
|
public const STONE = 1;
|
||||||
const GRASS = 2;
|
public const GRASS = 2;
|
||||||
const DIRT = 3;
|
public const DIRT = 3;
|
||||||
const COBBLESTONE = 4;
|
public const COBBLESTONE = 4;
|
||||||
const PLANKS = 5, WOODEN_PLANKS = 5;
|
public const PLANKS = 5, WOODEN_PLANKS = 5;
|
||||||
const SAPLING = 6;
|
public const SAPLING = 6;
|
||||||
const BEDROCK = 7;
|
public const BEDROCK = 7;
|
||||||
const FLOWING_WATER = 8;
|
public const FLOWING_WATER = 8;
|
||||||
const STILL_WATER = 9, WATER = 9;
|
public const STILL_WATER = 9, WATER = 9;
|
||||||
const FLOWING_LAVA = 10;
|
public const FLOWING_LAVA = 10;
|
||||||
const LAVA = 11, STILL_LAVA = 11;
|
public const LAVA = 11, STILL_LAVA = 11;
|
||||||
const SAND = 12;
|
public const SAND = 12;
|
||||||
const GRAVEL = 13;
|
public const GRAVEL = 13;
|
||||||
const GOLD_ORE = 14;
|
public const GOLD_ORE = 14;
|
||||||
const IRON_ORE = 15;
|
public const IRON_ORE = 15;
|
||||||
const COAL_ORE = 16;
|
public const COAL_ORE = 16;
|
||||||
const LOG = 17, WOOD = 17;
|
public const LOG = 17, WOOD = 17;
|
||||||
const LEAVES = 18;
|
public const LEAVES = 18;
|
||||||
const SPONGE = 19;
|
public const SPONGE = 19;
|
||||||
const GLASS = 20;
|
public const GLASS = 20;
|
||||||
const LAPIS_ORE = 21;
|
public const LAPIS_ORE = 21;
|
||||||
const LAPIS_BLOCK = 22;
|
public const LAPIS_BLOCK = 22;
|
||||||
const DISPENSER = 23;
|
public const DISPENSER = 23;
|
||||||
const SANDSTONE = 24;
|
public const SANDSTONE = 24;
|
||||||
const NOTEBLOCK = 25, NOTE_BLOCK = 25;
|
public const NOTEBLOCK = 25, NOTE_BLOCK = 25;
|
||||||
const BED_BLOCK = 26;
|
public const BED_BLOCK = 26;
|
||||||
const GOLDEN_RAIL = 27, POWERED_RAIL = 27;
|
public const GOLDEN_RAIL = 27, POWERED_RAIL = 27;
|
||||||
const DETECTOR_RAIL = 28;
|
public const DETECTOR_RAIL = 28;
|
||||||
const STICKY_PISTON = 29;
|
public const STICKY_PISTON = 29;
|
||||||
const COBWEB = 30, WEB = 30;
|
public const COBWEB = 30, WEB = 30;
|
||||||
const TALLGRASS = 31, TALL_GRASS = 31;
|
public const TALLGRASS = 31, TALL_GRASS = 31;
|
||||||
const DEADBUSH = 32, DEAD_BUSH = 32;
|
public const DEADBUSH = 32, DEAD_BUSH = 32;
|
||||||
const PISTON = 33;
|
public const PISTON = 33;
|
||||||
const PISTONARMCOLLISION = 34, PISTON_ARM_COLLISION = 34;
|
public const PISTONARMCOLLISION = 34, PISTON_ARM_COLLISION = 34;
|
||||||
const WOOL = 35;
|
public const WOOL = 35;
|
||||||
|
|
||||||
const DANDELION = 37, YELLOW_FLOWER = 37;
|
public const DANDELION = 37, YELLOW_FLOWER = 37;
|
||||||
const POPPY = 38, RED_FLOWER = 38;
|
public const POPPY = 38, RED_FLOWER = 38;
|
||||||
const BROWN_MUSHROOM = 39;
|
public const BROWN_MUSHROOM = 39;
|
||||||
const RED_MUSHROOM = 40;
|
public const RED_MUSHROOM = 40;
|
||||||
const GOLD_BLOCK = 41;
|
public const GOLD_BLOCK = 41;
|
||||||
const IRON_BLOCK = 42;
|
public const IRON_BLOCK = 42;
|
||||||
const DOUBLE_STONE_SLAB = 43;
|
public const DOUBLE_STONE_SLAB = 43;
|
||||||
const STONE_SLAB = 44;
|
public const STONE_SLAB = 44;
|
||||||
const BRICK_BLOCK = 45;
|
public const BRICK_BLOCK = 45;
|
||||||
const TNT = 46;
|
public const TNT = 46;
|
||||||
const BOOKSHELF = 47;
|
public const BOOKSHELF = 47;
|
||||||
const MOSSY_COBBLESTONE = 48, MOSS_STONE = 48;
|
public const MOSSY_COBBLESTONE = 48, MOSS_STONE = 48;
|
||||||
const OBSIDIAN = 49;
|
public const OBSIDIAN = 49;
|
||||||
const TORCH = 50;
|
public const TORCH = 50;
|
||||||
const FIRE = 51;
|
public const FIRE = 51;
|
||||||
const MOB_SPAWNER = 52, MONSTER_SPAWNER = 52;
|
public const MOB_SPAWNER = 52, MONSTER_SPAWNER = 52;
|
||||||
const OAK_STAIRS = 53, WOODEN_STAIRS = 53;
|
public const OAK_STAIRS = 53, WOODEN_STAIRS = 53;
|
||||||
const CHEST = 54;
|
public const CHEST = 54;
|
||||||
const REDSTONE_WIRE = 55;
|
public const REDSTONE_WIRE = 55;
|
||||||
const DIAMOND_ORE = 56;
|
public const DIAMOND_ORE = 56;
|
||||||
const DIAMOND_BLOCK = 57;
|
public const DIAMOND_BLOCK = 57;
|
||||||
const CRAFTING_TABLE = 58, WORKBENCH = 58;
|
public const CRAFTING_TABLE = 58, WORKBENCH = 58;
|
||||||
const WHEAT_BLOCK = 59;
|
public const WHEAT_BLOCK = 59;
|
||||||
const FARMLAND = 60;
|
public const FARMLAND = 60;
|
||||||
const FURNACE = 61;
|
public const FURNACE = 61;
|
||||||
const BURNING_FURNACE = 62, LIT_FURNACE = 62;
|
public const BURNING_FURNACE = 62, LIT_FURNACE = 62;
|
||||||
const SIGN_POST = 63, STANDING_SIGN = 63;
|
public const SIGN_POST = 63, STANDING_SIGN = 63;
|
||||||
const OAK_DOOR_BLOCK = 64, WOODEN_DOOR_BLOCK = 64;
|
public const OAK_DOOR_BLOCK = 64, WOODEN_DOOR_BLOCK = 64;
|
||||||
const LADDER = 65;
|
public const LADDER = 65;
|
||||||
const RAIL = 66;
|
public const RAIL = 66;
|
||||||
const COBBLESTONE_STAIRS = 67, STONE_STAIRS = 67;
|
public const COBBLESTONE_STAIRS = 67, STONE_STAIRS = 67;
|
||||||
const WALL_SIGN = 68;
|
public const WALL_SIGN = 68;
|
||||||
const LEVER = 69;
|
public const LEVER = 69;
|
||||||
const STONE_PRESSURE_PLATE = 70;
|
public const STONE_PRESSURE_PLATE = 70;
|
||||||
const IRON_DOOR_BLOCK = 71;
|
public const IRON_DOOR_BLOCK = 71;
|
||||||
const WOODEN_PRESSURE_PLATE = 72;
|
public const WOODEN_PRESSURE_PLATE = 72;
|
||||||
const REDSTONE_ORE = 73;
|
public const REDSTONE_ORE = 73;
|
||||||
const GLOWING_REDSTONE_ORE = 74, LIT_REDSTONE_ORE = 74;
|
public const GLOWING_REDSTONE_ORE = 74, LIT_REDSTONE_ORE = 74;
|
||||||
const UNLIT_REDSTONE_TORCH = 75;
|
public const UNLIT_REDSTONE_TORCH = 75;
|
||||||
const LIT_REDSTONE_TORCH = 76, REDSTONE_TORCH = 76;
|
public const LIT_REDSTONE_TORCH = 76, REDSTONE_TORCH = 76;
|
||||||
const STONE_BUTTON = 77;
|
public const STONE_BUTTON = 77;
|
||||||
const SNOW_LAYER = 78;
|
public const SNOW_LAYER = 78;
|
||||||
const ICE = 79;
|
public const ICE = 79;
|
||||||
const SNOW = 80, SNOW_BLOCK = 80;
|
public const SNOW = 80, SNOW_BLOCK = 80;
|
||||||
const CACTUS = 81;
|
public const CACTUS = 81;
|
||||||
const CLAY_BLOCK = 82;
|
public const CLAY_BLOCK = 82;
|
||||||
const REEDS_BLOCK = 83, SUGARCANE_BLOCK = 83;
|
public const REEDS_BLOCK = 83, SUGARCANE_BLOCK = 83;
|
||||||
const JUKEBOX = 84;
|
public const JUKEBOX = 84;
|
||||||
const FENCE = 85;
|
public const FENCE = 85;
|
||||||
const PUMPKIN = 86;
|
public const PUMPKIN = 86;
|
||||||
const NETHERRACK = 87;
|
public const NETHERRACK = 87;
|
||||||
const SOUL_SAND = 88;
|
public const SOUL_SAND = 88;
|
||||||
const GLOWSTONE = 89;
|
public const GLOWSTONE = 89;
|
||||||
const PORTAL = 90;
|
public const PORTAL = 90;
|
||||||
const JACK_O_LANTERN = 91, LIT_PUMPKIN = 91;
|
public const JACK_O_LANTERN = 91, LIT_PUMPKIN = 91;
|
||||||
const CAKE_BLOCK = 92;
|
public const CAKE_BLOCK = 92;
|
||||||
const REPEATER_BLOCK = 93, UNPOWERED_REPEATER = 93;
|
public const REPEATER_BLOCK = 93, UNPOWERED_REPEATER = 93;
|
||||||
const POWERED_REPEATER = 94;
|
public const POWERED_REPEATER = 94;
|
||||||
const INVISIBLEBEDROCK = 95, INVISIBLE_BEDROCK = 95;
|
public const INVISIBLEBEDROCK = 95, INVISIBLE_BEDROCK = 95;
|
||||||
const TRAPDOOR = 96, WOODEN_TRAPDOOR = 96;
|
public const TRAPDOOR = 96, WOODEN_TRAPDOOR = 96;
|
||||||
const MONSTER_EGG = 97;
|
public const MONSTER_EGG = 97;
|
||||||
const STONEBRICK = 98, STONE_BRICK = 98, STONE_BRICKS = 98;
|
public const STONEBRICK = 98, STONE_BRICK = 98, STONE_BRICKS = 98;
|
||||||
const BROWN_MUSHROOM_BLOCK = 99;
|
public const BROWN_MUSHROOM_BLOCK = 99;
|
||||||
const RED_MUSHROOM_BLOCK = 100;
|
public const RED_MUSHROOM_BLOCK = 100;
|
||||||
const IRON_BARS = 101;
|
public const IRON_BARS = 101;
|
||||||
const GLASS_PANE = 102;
|
public const GLASS_PANE = 102;
|
||||||
const MELON_BLOCK = 103;
|
public const MELON_BLOCK = 103;
|
||||||
const PUMPKIN_STEM = 104;
|
public const PUMPKIN_STEM = 104;
|
||||||
const MELON_STEM = 105;
|
public const MELON_STEM = 105;
|
||||||
const VINE = 106, VINES = 106;
|
public const VINE = 106, VINES = 106;
|
||||||
const FENCE_GATE = 107, OAK_FENCE_GATE = 107;
|
public const FENCE_GATE = 107, OAK_FENCE_GATE = 107;
|
||||||
const BRICK_STAIRS = 108;
|
public const BRICK_STAIRS = 108;
|
||||||
const STONE_BRICK_STAIRS = 109;
|
public const STONE_BRICK_STAIRS = 109;
|
||||||
const MYCELIUM = 110;
|
public const MYCELIUM = 110;
|
||||||
const LILY_PAD = 111, WATERLILY = 111, WATER_LILY = 111;
|
public const LILY_PAD = 111, WATERLILY = 111, WATER_LILY = 111;
|
||||||
const NETHER_BRICK_BLOCK = 112;
|
public const NETHER_BRICK_BLOCK = 112;
|
||||||
const NETHER_BRICK_FENCE = 113;
|
public const NETHER_BRICK_FENCE = 113;
|
||||||
const NETHER_BRICK_STAIRS = 114;
|
public const NETHER_BRICK_STAIRS = 114;
|
||||||
const NETHER_WART_PLANT = 115;
|
public const NETHER_WART_PLANT = 115;
|
||||||
const ENCHANTING_TABLE = 116, ENCHANTMENT_TABLE = 116;
|
public const ENCHANTING_TABLE = 116, ENCHANTMENT_TABLE = 116;
|
||||||
const BREWING_STAND_BLOCK = 117;
|
public const BREWING_STAND_BLOCK = 117;
|
||||||
const CAULDRON_BLOCK = 118;
|
public const CAULDRON_BLOCK = 118;
|
||||||
const END_PORTAL = 119;
|
public const END_PORTAL = 119;
|
||||||
const END_PORTAL_FRAME = 120;
|
public const END_PORTAL_FRAME = 120;
|
||||||
const END_STONE = 121;
|
public const END_STONE = 121;
|
||||||
const DRAGON_EGG = 122;
|
public const DRAGON_EGG = 122;
|
||||||
const REDSTONE_LAMP = 123;
|
public const REDSTONE_LAMP = 123;
|
||||||
const LIT_REDSTONE_LAMP = 124;
|
public const LIT_REDSTONE_LAMP = 124;
|
||||||
const DROPPER = 125;
|
public const DROPPER = 125;
|
||||||
const ACTIVATOR_RAIL = 126;
|
public const ACTIVATOR_RAIL = 126;
|
||||||
const COCOA = 127, COCOA_BLOCK = 127;
|
public const COCOA = 127, COCOA_BLOCK = 127;
|
||||||
const SANDSTONE_STAIRS = 128;
|
public const SANDSTONE_STAIRS = 128;
|
||||||
const EMERALD_ORE = 129;
|
public const EMERALD_ORE = 129;
|
||||||
const ENDER_CHEST = 130;
|
public const ENDER_CHEST = 130;
|
||||||
const TRIPWIRE_HOOK = 131;
|
public const TRIPWIRE_HOOK = 131;
|
||||||
const TRIPWIRE = 132, TRIP_WIRE = 132;
|
public const TRIPWIRE = 132, TRIP_WIRE = 132;
|
||||||
const EMERALD_BLOCK = 133;
|
public const EMERALD_BLOCK = 133;
|
||||||
const SPRUCE_STAIRS = 134;
|
public const SPRUCE_STAIRS = 134;
|
||||||
const BIRCH_STAIRS = 135;
|
public const BIRCH_STAIRS = 135;
|
||||||
const JUNGLE_STAIRS = 136;
|
public const JUNGLE_STAIRS = 136;
|
||||||
const COMMAND_BLOCK = 137;
|
public const COMMAND_BLOCK = 137;
|
||||||
const BEACON = 138;
|
public const BEACON = 138;
|
||||||
const COBBLESTONE_WALL = 139, STONE_WALL = 139;
|
public const COBBLESTONE_WALL = 139, STONE_WALL = 139;
|
||||||
const FLOWER_POT_BLOCK = 140;
|
public const FLOWER_POT_BLOCK = 140;
|
||||||
const CARROTS = 141, CARROT_BLOCK = 141;
|
public const CARROTS = 141, CARROT_BLOCK = 141;
|
||||||
const POTATOES = 142, POTATO_BLOCK = 142;
|
public const POTATOES = 142, POTATO_BLOCK = 142;
|
||||||
const WOODEN_BUTTON = 143;
|
public const WOODEN_BUTTON = 143;
|
||||||
const MOB_HEAD_BLOCK = 144, SKULL_BLOCK = 144;
|
public const MOB_HEAD_BLOCK = 144, SKULL_BLOCK = 144;
|
||||||
const ANVIL = 145;
|
public const ANVIL = 145;
|
||||||
const TRAPPED_CHEST = 146;
|
public const TRAPPED_CHEST = 146;
|
||||||
const LIGHT_WEIGHTED_PRESSURE_PLATE = 147;
|
public const LIGHT_WEIGHTED_PRESSURE_PLATE = 147;
|
||||||
const HEAVY_WEIGHTED_PRESSURE_PLATE = 148;
|
public const HEAVY_WEIGHTED_PRESSURE_PLATE = 148;
|
||||||
const COMPARATOR_BLOCK = 149, UNPOWERED_COMPARATOR = 149;
|
public const COMPARATOR_BLOCK = 149, UNPOWERED_COMPARATOR = 149;
|
||||||
const POWERED_COMPARATOR = 150;
|
public const POWERED_COMPARATOR = 150;
|
||||||
const DAYLIGHT_DETECTOR = 151, DAYLIGHT_SENSOR = 151;
|
public const DAYLIGHT_DETECTOR = 151, DAYLIGHT_SENSOR = 151;
|
||||||
const REDSTONE_BLOCK = 152;
|
public const REDSTONE_BLOCK = 152;
|
||||||
const NETHER_QUARTZ_ORE = 153, QUARTZ_ORE = 153;
|
public const NETHER_QUARTZ_ORE = 153, QUARTZ_ORE = 153;
|
||||||
const HOPPER_BLOCK = 154;
|
public const HOPPER_BLOCK = 154;
|
||||||
const QUARTZ_BLOCK = 155;
|
public const QUARTZ_BLOCK = 155;
|
||||||
const QUARTZ_STAIRS = 156;
|
public const QUARTZ_STAIRS = 156;
|
||||||
const DOUBLE_WOODEN_SLAB = 157;
|
public const DOUBLE_WOODEN_SLAB = 157;
|
||||||
const WOODEN_SLAB = 158;
|
public const WOODEN_SLAB = 158;
|
||||||
const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159, TERRACOTTA = 159;
|
public const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159, TERRACOTTA = 159;
|
||||||
const STAINED_GLASS_PANE = 160;
|
public const STAINED_GLASS_PANE = 160;
|
||||||
const LEAVES2 = 161;
|
public const LEAVES2 = 161;
|
||||||
const LOG2 = 162, WOOD2 = 162;
|
public const LOG2 = 162, WOOD2 = 162;
|
||||||
const ACACIA_STAIRS = 163;
|
public const ACACIA_STAIRS = 163;
|
||||||
const DARK_OAK_STAIRS = 164;
|
public const DARK_OAK_STAIRS = 164;
|
||||||
const SLIME = 165, SLIME_BLOCK = 165;
|
public const SLIME = 165, SLIME_BLOCK = 165;
|
||||||
|
|
||||||
const IRON_TRAPDOOR = 167;
|
public const IRON_TRAPDOOR = 167;
|
||||||
const PRISMARINE = 168;
|
public const PRISMARINE = 168;
|
||||||
const SEALANTERN = 169, SEA_LANTERN = 169;
|
public const SEALANTERN = 169, SEA_LANTERN = 169;
|
||||||
const HAY_BALE = 170, HAY_BLOCK = 170;
|
public const HAY_BALE = 170, HAY_BLOCK = 170;
|
||||||
const CARPET = 171;
|
public const CARPET = 171;
|
||||||
const HARDENED_CLAY = 172;
|
public const HARDENED_CLAY = 172;
|
||||||
const COAL_BLOCK = 173;
|
public const COAL_BLOCK = 173;
|
||||||
const PACKED_ICE = 174;
|
public const PACKED_ICE = 174;
|
||||||
const DOUBLE_PLANT = 175;
|
public const DOUBLE_PLANT = 175;
|
||||||
const STANDING_BANNER = 176;
|
public const STANDING_BANNER = 176;
|
||||||
const WALL_BANNER = 177;
|
public const WALL_BANNER = 177;
|
||||||
const DAYLIGHT_DETECTOR_INVERTED = 178, DAYLIGHT_SENSOR_INVERTED = 178;
|
public const DAYLIGHT_DETECTOR_INVERTED = 178, DAYLIGHT_SENSOR_INVERTED = 178;
|
||||||
const RED_SANDSTONE = 179;
|
public const RED_SANDSTONE = 179;
|
||||||
const RED_SANDSTONE_STAIRS = 180;
|
public const RED_SANDSTONE_STAIRS = 180;
|
||||||
const DOUBLE_STONE_SLAB2 = 181;
|
public const DOUBLE_STONE_SLAB2 = 181;
|
||||||
const STONE_SLAB2 = 182;
|
public const STONE_SLAB2 = 182;
|
||||||
const SPRUCE_FENCE_GATE = 183;
|
public const SPRUCE_FENCE_GATE = 183;
|
||||||
const BIRCH_FENCE_GATE = 184;
|
public const BIRCH_FENCE_GATE = 184;
|
||||||
const JUNGLE_FENCE_GATE = 185;
|
public const JUNGLE_FENCE_GATE = 185;
|
||||||
const DARK_OAK_FENCE_GATE = 186;
|
public const DARK_OAK_FENCE_GATE = 186;
|
||||||
const ACACIA_FENCE_GATE = 187;
|
public const ACACIA_FENCE_GATE = 187;
|
||||||
const REPEATING_COMMAND_BLOCK = 188;
|
public const REPEATING_COMMAND_BLOCK = 188;
|
||||||
const CHAIN_COMMAND_BLOCK = 189;
|
public const CHAIN_COMMAND_BLOCK = 189;
|
||||||
|
|
||||||
const SPRUCE_DOOR_BLOCK = 193;
|
public const SPRUCE_DOOR_BLOCK = 193;
|
||||||
const BIRCH_DOOR_BLOCK = 194;
|
public const BIRCH_DOOR_BLOCK = 194;
|
||||||
const JUNGLE_DOOR_BLOCK = 195;
|
public const JUNGLE_DOOR_BLOCK = 195;
|
||||||
const ACACIA_DOOR_BLOCK = 196;
|
public const ACACIA_DOOR_BLOCK = 196;
|
||||||
const DARK_OAK_DOOR_BLOCK = 197;
|
public const DARK_OAK_DOOR_BLOCK = 197;
|
||||||
const GRASS_PATH = 198;
|
public const GRASS_PATH = 198;
|
||||||
const FRAME_BLOCK = 199, ITEM_FRAME_BLOCK = 199;
|
public const FRAME_BLOCK = 199, ITEM_FRAME_BLOCK = 199;
|
||||||
const CHORUS_FLOWER = 200;
|
public const CHORUS_FLOWER = 200;
|
||||||
const PURPUR_BLOCK = 201;
|
public const PURPUR_BLOCK = 201;
|
||||||
|
|
||||||
const PURPUR_STAIRS = 203;
|
public const PURPUR_STAIRS = 203;
|
||||||
|
|
||||||
const UNDYED_SHULKER_BOX = 205;
|
public const UNDYED_SHULKER_BOX = 205;
|
||||||
const END_BRICKS = 206;
|
public const END_BRICKS = 206;
|
||||||
const FROSTED_ICE = 207;
|
public const FROSTED_ICE = 207;
|
||||||
const END_ROD = 208;
|
public const END_ROD = 208;
|
||||||
const END_GATEWAY = 209;
|
public const END_GATEWAY = 209;
|
||||||
|
|
||||||
const MAGMA = 213;
|
public const MAGMA = 213;
|
||||||
const NETHER_WART_BLOCK = 214;
|
public const NETHER_WART_BLOCK = 214;
|
||||||
const RED_NETHER_BRICK = 215;
|
public const RED_NETHER_BRICK = 215;
|
||||||
const BONE_BLOCK = 216;
|
public const BONE_BLOCK = 216;
|
||||||
|
|
||||||
const SHULKER_BOX = 218;
|
public const SHULKER_BOX = 218;
|
||||||
const PURPLE_GLAZED_TERRACOTTA = 219;
|
public const PURPLE_GLAZED_TERRACOTTA = 219;
|
||||||
const WHITE_GLAZED_TERRACOTTA = 220;
|
public const WHITE_GLAZED_TERRACOTTA = 220;
|
||||||
const ORANGE_GLAZED_TERRACOTTA = 221;
|
public const ORANGE_GLAZED_TERRACOTTA = 221;
|
||||||
const MAGENTA_GLAZED_TERRACOTTA = 222;
|
public const MAGENTA_GLAZED_TERRACOTTA = 222;
|
||||||
const LIGHT_BLUE_GLAZED_TERRACOTTA = 223;
|
public const LIGHT_BLUE_GLAZED_TERRACOTTA = 223;
|
||||||
const YELLOW_GLAZED_TERRACOTTA = 224;
|
public const YELLOW_GLAZED_TERRACOTTA = 224;
|
||||||
const LIME_GLAZED_TERRACOTTA = 225;
|
public const LIME_GLAZED_TERRACOTTA = 225;
|
||||||
const PINK_GLAZED_TERRACOTTA = 226;
|
public const PINK_GLAZED_TERRACOTTA = 226;
|
||||||
const GRAY_GLAZED_TERRACOTTA = 227;
|
public const GRAY_GLAZED_TERRACOTTA = 227;
|
||||||
const SILVER_GLAZED_TERRACOTTA = 228;
|
public const SILVER_GLAZED_TERRACOTTA = 228;
|
||||||
const CYAN_GLAZED_TERRACOTTA = 229;
|
public const CYAN_GLAZED_TERRACOTTA = 229;
|
||||||
|
|
||||||
const BLUE_GLAZED_TERRACOTTA = 231;
|
public const BLUE_GLAZED_TERRACOTTA = 231;
|
||||||
const BROWN_GLAZED_TERRACOTTA = 232;
|
public const BROWN_GLAZED_TERRACOTTA = 232;
|
||||||
const GREEN_GLAZED_TERRACOTTA = 233;
|
public const GREEN_GLAZED_TERRACOTTA = 233;
|
||||||
const RED_GLAZED_TERRACOTTA = 234;
|
public const RED_GLAZED_TERRACOTTA = 234;
|
||||||
const BLACK_GLAZED_TERRACOTTA = 235;
|
public const BLACK_GLAZED_TERRACOTTA = 235;
|
||||||
const CONCRETE = 236;
|
public const CONCRETE = 236;
|
||||||
const CONCRETEPOWDER = 237, CONCRETE_POWDER = 237;
|
public const CONCRETEPOWDER = 237, CONCRETE_POWDER = 237;
|
||||||
|
|
||||||
const CHORUS_PLANT = 240;
|
public const CHORUS_PLANT = 240;
|
||||||
const STAINED_GLASS = 241;
|
public const STAINED_GLASS = 241;
|
||||||
|
|
||||||
const PODZOL = 243;
|
public const PODZOL = 243;
|
||||||
const BEETROOT_BLOCK = 244;
|
public const BEETROOT_BLOCK = 244;
|
||||||
const STONECUTTER = 245;
|
public const STONECUTTER = 245;
|
||||||
const GLOWINGOBSIDIAN = 246, GLOWING_OBSIDIAN = 246;
|
public const GLOWINGOBSIDIAN = 246, GLOWING_OBSIDIAN = 246;
|
||||||
const NETHERREACTOR = 247, NETHER_REACTOR = 247;
|
public const NETHERREACTOR = 247, NETHER_REACTOR = 247;
|
||||||
const INFO_UPDATE = 248;
|
public const INFO_UPDATE = 248;
|
||||||
const INFO_UPDATE2 = 249;
|
public const INFO_UPDATE2 = 249;
|
||||||
const MOVINGBLOCK = 250, MOVING_BLOCK = 250;
|
public const MOVINGBLOCK = 250, MOVING_BLOCK = 250;
|
||||||
const OBSERVER = 251;
|
public const OBSERVER = 251;
|
||||||
const STRUCTURE_BLOCK = 252;
|
public const STRUCTURE_BLOCK = 252;
|
||||||
|
|
||||||
const RESERVED6 = 255;
|
public const RESERVED6 = 255;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -21,21 +21,19 @@
|
|||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace pocketmine\block;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Math related classes, like matrices, bounding boxes and vector
|
* Types of tools that can be used to break blocks
|
||||||
|
* Blocks may allow multiple tool types by combining these bitflags
|
||||||
*/
|
*/
|
||||||
namespace pocketmine\math;
|
interface BlockToolType{
|
||||||
|
|
||||||
|
public const TYPE_NONE = 0;
|
||||||
|
public const TYPE_SWORD = 1 << 0;
|
||||||
|
public const TYPE_SHOVEL = 1 << 1;
|
||||||
|
public const TYPE_PICKAXE = 1 << 2;
|
||||||
|
public const TYPE_AXE = 1 << 3;
|
||||||
|
public const TYPE_SHEARS = 1 << 4;
|
||||||
|
|
||||||
abstract class Math{
|
}
|
||||||
|
|
||||||
public static function floorFloat($n) : int{
|
|
||||||
$i = (int) $n;
|
|
||||||
return $n >= $i ? $i : $i - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function ceilFloat($n) : int{
|
|
||||||
$i = (int) ($n + 1);
|
|
||||||
return $n >= $i ? $i : $i - 1;
|
|
||||||
}
|
|
||||||
}
|
|
@ -25,7 +25,7 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\block\utils\PillarRotationHelper;
|
use pocketmine\block\utils\PillarRotationHelper;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
|
|
||||||
@ -46,10 +46,14 @@ class BoneBlock extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
$this->meta = PillarRotationHelper::getMetaFromFace($this->meta, $face);
|
$this->meta = PillarRotationHelper::getMetaFromFace($this->meta, $face);
|
||||||
return $this->getLevel()->setBlock($blockReplace, $this, true, true);
|
return $this->getLevel()->setBlock($blockReplace, $this, true, true);
|
||||||
}
|
}
|
||||||
@ -57,13 +61,4 @@ class BoneBlock extends Solid{
|
|||||||
public function getVariantBitmask() : int{
|
public function getVariantBitmask() : int{
|
||||||
return 0x03;
|
return 0x03;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public function getDrops(Item $item) : array{
|
|
||||||
if($item->isPickaxe() >= Tool::TIER_WOODEN){
|
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
@ -25,7 +25,6 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\ItemFactory;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class Bookshelf extends Solid{
|
class Bookshelf extends Solid{
|
||||||
|
|
||||||
@ -44,10 +43,10 @@ class Bookshelf extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_AXE;
|
return BlockToolType::TYPE_AXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [
|
return [
|
||||||
ItemFactory::get(Item::BOOK, 0, 3)
|
ItemFactory::get(Item::BOOK, 0, 3)
|
||||||
];
|
];
|
||||||
@ -57,4 +56,11 @@ class Bookshelf extends Solid{
|
|||||||
return 300;
|
return 300;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
public function getFlameEncouragement() : int{
|
||||||
|
return 30;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getFlammability() : int{
|
||||||
|
return 20;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -23,7 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\TieredTool;
|
||||||
|
|
||||||
class BrewingStand extends Transparent{
|
class BrewingStand extends Transparent{
|
||||||
|
|
||||||
@ -42,7 +42,11 @@ class BrewingStand extends Transparent{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getVariantBitmask() : int{
|
public function getVariantBitmask() : int{
|
||||||
@ -50,4 +54,4 @@ class BrewingStand extends Transparent{
|
|||||||
}
|
}
|
||||||
|
|
||||||
//TODO
|
//TODO
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\TieredTool;
|
||||||
|
|
||||||
class BrickStairs extends Stair{
|
class BrickStairs extends Stair{
|
||||||
|
|
||||||
@ -42,11 +42,14 @@ class BrickStairs extends Stair{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName() : string{
|
public function getName() : string{
|
||||||
return "Brick Stairs";
|
return "Brick Stairs";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
@ -23,8 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class Bricks extends Solid{
|
class Bricks extends Solid{
|
||||||
|
|
||||||
@ -43,18 +42,14 @@ class Bricks extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName() : string{
|
public function getName() : string{
|
||||||
return "Bricks";
|
return "Bricks";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public function getDrops(Item $item) : array{
|
|
||||||
if($item->isPickaxe() >= Tool::TIER_WOODEN){
|
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -34,4 +34,4 @@ class BrownMushroom extends RedMushroom{
|
|||||||
public function getLightLevel() : int{
|
public function getLightLevel() : int{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -33,9 +33,9 @@ class BrownMushroomBlock extends RedMushroomBlock{
|
|||||||
return "Brown Mushroom Block";
|
return "Brown Mushroom Block";
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [
|
return [
|
||||||
Item::get(Item::BROWN_MUSHROOM, 0, mt_rand(0, 2))
|
Item::get(Item::BROWN_MUSHROOM, 0, mt_rand(0, 2))
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,9 +24,8 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\nbt\tag\StringTag;
|
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
use pocketmine\tile\Furnace as TileFurnace;
|
use pocketmine\tile\Furnace as TileFurnace;
|
||||||
use pocketmine\tile\Tile;
|
use pocketmine\tile\Tile;
|
||||||
@ -35,6 +34,8 @@ class BurningFurnace extends Solid{
|
|||||||
|
|
||||||
protected $id = self::BURNING_FURNACE;
|
protected $id = self::BURNING_FURNACE;
|
||||||
|
|
||||||
|
protected $itemId = self::FURNACE;
|
||||||
|
|
||||||
public function __construct(int $meta = 0){
|
public function __construct(int $meta = 0){
|
||||||
$this->meta = $meta;
|
$this->meta = $meta;
|
||||||
}
|
}
|
||||||
@ -48,14 +49,18 @@ class BurningFurnace extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getLightLevel() : int{
|
public function getLightLevel() : int{
|
||||||
return 13;
|
return 13;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
$faces = [
|
$faces = [
|
||||||
0 => 4,
|
0 => 4,
|
||||||
1 => 2,
|
1 => 2,
|
||||||
@ -77,10 +82,8 @@ class BurningFurnace extends Solid{
|
|||||||
$furnace = Tile::createTile(Tile::FURNACE, $this->getLevel(), TileFurnace::createNBT($this));
|
$furnace = Tile::createTile(Tile::FURNACE, $this->getLevel(), TileFurnace::createNBT($this));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($furnace->namedtag->Lock) and $furnace->namedtag->Lock instanceof StringTag){
|
if(!$furnace->canOpenWith($item->getCustomName())){
|
||||||
if($furnace->namedtag->Lock->getValue() !== $item->getCustomName()){
|
return true;
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$player->addWindow($furnace->getInventory());
|
$player->addWindow($furnace->getInventory());
|
||||||
@ -92,12 +95,4 @@ class BurningFurnace extends Solid{
|
|||||||
public function getVariantBitmask() : int{
|
public function getVariantBitmask() : int{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public function getDrops(Item $item) : array{
|
|
||||||
if($item->isPickaxe() >= Tool::TIER_WOODEN){
|
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -37,7 +37,7 @@ abstract class Button extends Flowable{
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
//TODO: check valid target block
|
//TODO: check valid target block
|
||||||
$this->meta = $face;
|
$this->meta = $face;
|
||||||
|
|
||||||
@ -48,4 +48,4 @@ abstract class Button extends Flowable{
|
|||||||
//TODO
|
//TODO
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@ use pocketmine\event\block\BlockGrowEvent;
|
|||||||
use pocketmine\event\entity\EntityDamageByBlockEvent;
|
use pocketmine\event\entity\EntityDamageByBlockEvent;
|
||||||
use pocketmine\event\entity\EntityDamageEvent;
|
use pocketmine\event\entity\EntityDamageEvent;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\math\AxisAlignedBB;
|
use pocketmine\math\AxisAlignedBB;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
@ -66,60 +65,59 @@ class Cactus extends Transparent{
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function ticksRandomly() : bool{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function onEntityCollide(Entity $entity) : void{
|
public function onEntityCollide(Entity $entity) : void{
|
||||||
$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_CONTACT, 1);
|
$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_CONTACT, 1);
|
||||||
$entity->attack($ev);
|
$entity->attack($ev);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onNearbyBlockChange() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL){
|
$down = $this->getSide(Vector3::SIDE_DOWN);
|
||||||
$down = $this->getSide(Vector3::SIDE_DOWN);
|
if($down->getId() !== self::SAND and $down->getId() !== self::CACTUS){
|
||||||
if($down->getId() !== self::SAND and $down->getId() !== self::CACTUS){
|
$this->getLevel()->useBreakOn($this);
|
||||||
$this->getLevel()->useBreakOn($this);
|
}else{
|
||||||
}else{
|
for($side = 2; $side <= 5; ++$side){
|
||||||
for($side = 2; $side <= 5; ++$side){
|
$b = $this->getSide($side);
|
||||||
$b = $this->getSide($side);
|
if(!$b->canBeFlowedInto()){
|
||||||
if(!$b->canBeFlowedInto()){
|
$this->getLevel()->useBreakOn($this);
|
||||||
$this->getLevel()->useBreakOn($this);
|
break;
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}elseif($type === Level::BLOCK_UPDATE_RANDOM){
|
|
||||||
if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::CACTUS){
|
|
||||||
if($this->meta === 0x0f){
|
|
||||||
for($y = 1; $y < 3; ++$y){
|
|
||||||
$b = $this->getLevel()->getBlockAt($this->x, $this->y + $y, $this->z);
|
|
||||||
if($b->getId() === self::AIR){
|
|
||||||
Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, BlockFactory::get(Block::CACTUS)));
|
|
||||||
if(!$ev->isCancelled()){
|
|
||||||
$this->getLevel()->setBlock($b, $ev->getNewState(), true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$this->meta = 0;
|
|
||||||
$this->getLevel()->setBlock($this, $this);
|
|
||||||
}else{
|
|
||||||
++$this->meta;
|
|
||||||
$this->getLevel()->setBlock($this, $this);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function ticksRandomly() : bool{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function onRandomTick() : void{
|
||||||
|
if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::CACTUS){
|
||||||
|
if($this->meta === 0x0f){
|
||||||
|
for($y = 1; $y < 3; ++$y){
|
||||||
|
$b = $this->getLevel()->getBlockAt($this->x, $this->y + $y, $this->z);
|
||||||
|
if($b->getId() === self::AIR){
|
||||||
|
Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, BlockFactory::get(Block::CACTUS)));
|
||||||
|
if(!$ev->isCancelled()){
|
||||||
|
$this->getLevel()->setBlock($b, $ev->getNewState(), true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$this->meta = 0;
|
||||||
|
$this->getLevel()->setBlock($this, $this);
|
||||||
|
}else{
|
||||||
|
++$this->meta;
|
||||||
|
$this->getLevel()->setBlock($this, $this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
$down = $this->getSide(Vector3::SIDE_DOWN);
|
$down = $this->getSide(Vector3::SIDE_DOWN);
|
||||||
if($down->getId() === self::SAND or $down->getId() === self::CACTUS){
|
if($down->getId() === self::SAND or $down->getId() === self::CACTUS){
|
||||||
$block0 = $this->getSide(Vector3::SIDE_NORTH);
|
$block0 = $this->getSide(Vector3::SIDE_NORTH);
|
||||||
$block1 = $this->getSide(Vector3::SIDE_SOUTH);
|
$block1 = $this->getSide(Vector3::SIDE_SOUTH);
|
||||||
$block2 = $this->getSide(Vector3::SIDE_WEST);
|
$block2 = $this->getSide(Vector3::SIDE_WEST);
|
||||||
$block3 = $this->getSide(Vector3::SIDE_EAST);
|
$block3 = $this->getSide(Vector3::SIDE_EAST);
|
||||||
if($block0->isTransparent() === true and $block1->isTransparent() === true and $block2->isTransparent() === true and $block3->isTransparent() === true){
|
if($block0->isTransparent() and $block1->isTransparent() and $block2->isTransparent() and $block3->isTransparent()){
|
||||||
$this->getLevel()->setBlock($this, $this, true);
|
$this->getLevel()->setBlock($this, $this, true);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -132,4 +130,4 @@ class Cactus extends Transparent{
|
|||||||
public function getVariantBitmask() : int{
|
public function getVariantBitmask() : int{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,11 +23,10 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\entity\Effect;
|
use pocketmine\entity\EffectInstance;
|
||||||
use pocketmine\event\entity\EntityEatBlockEvent;
|
use pocketmine\entity\Living;
|
||||||
use pocketmine\item\FoodSource;
|
use pocketmine\item\FoodSource;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\math\AxisAlignedBB;
|
use pocketmine\math\AxisAlignedBB;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
@ -45,7 +44,7 @@ class Cake extends Transparent implements FoodSource{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getName() : string{
|
public function getName() : string{
|
||||||
return "Cake Block";
|
return "Cake";
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function recalculateBoundingBox() : ?AxisAlignedBB{
|
protected function recalculateBoundingBox() : ?AxisAlignedBB{
|
||||||
@ -62,7 +61,7 @@ class Cake extends Transparent implements FoodSource{
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
$down = $this->getSide(Vector3::SIDE_DOWN);
|
$down = $this->getSide(Vector3::SIDE_DOWN);
|
||||||
if($down->getId() !== self::AIR){
|
if($down->getId() !== self::AIR){
|
||||||
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
||||||
@ -73,37 +72,24 @@ class Cake extends Transparent implements FoodSource{
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onNearbyBlockChange() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL){
|
if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
|
||||||
if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
|
$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
|
||||||
$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
|
|
||||||
|
|
||||||
return Level::BLOCK_UPDATE_NORMAL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function isAffectedBySilkTouch() : bool{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
public function onActivate(Item $item, Player $player = null) : bool{
|
public function onActivate(Item $item, Player $player = null) : bool{
|
||||||
//TODO: refactor this into generic food handling
|
if($player !== null){
|
||||||
if($player instanceof Player and $player->getFood() < $player->getMaxFood()){
|
$player->consumeObject($this);
|
||||||
$player->getServer()->getPluginManager()->callEvent($ev = new EntityEatBlockEvent($player, $this));
|
return true;
|
||||||
|
|
||||||
if(!$ev->isCancelled()){
|
|
||||||
$player->addFood($ev->getFoodRestore());
|
|
||||||
$player->addSaturation($ev->getSaturationRestore());
|
|
||||||
foreach($ev->getAdditionalEffects() as $effect){
|
|
||||||
$player->addEffect($effect);
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->getLevel()->setBlock($this, $ev->getResidue());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@ -117,6 +103,13 @@ class Cake extends Transparent implements FoodSource{
|
|||||||
return 0.4;
|
return 0.4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function requiresHunger() : bool{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Block
|
||||||
|
*/
|
||||||
public function getResidue(){
|
public function getResidue(){
|
||||||
$clone = clone $this;
|
$clone = clone $this;
|
||||||
$clone->meta++;
|
$clone->meta++;
|
||||||
@ -127,9 +120,13 @@ class Cake extends Transparent implements FoodSource{
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Effect[]
|
* @return EffectInstance[]
|
||||||
*/
|
*/
|
||||||
public function getAdditionalEffects() : array{
|
public function getAdditionalEffects() : array{
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function onConsume(Living $consumer) : void{
|
||||||
|
$this->level->setBlock($this, $this->getResidue());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,6 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\block\utils\ColorBlockMetaHelper;
|
use pocketmine\block\utils\ColorBlockMetaHelper;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\math\AxisAlignedBB;
|
use pocketmine\math\AxisAlignedBB;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
@ -62,7 +61,7 @@ class Carpet extends Flowable{
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
$down = $this->getSide(Vector3::SIDE_DOWN);
|
$down = $this->getSide(Vector3::SIDE_DOWN);
|
||||||
if($down->getId() !== self::AIR){
|
if($down->getId() !== self::AIR){
|
||||||
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
||||||
@ -73,16 +72,17 @@ class Carpet extends Flowable{
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onNearbyBlockChange() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL){
|
if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){
|
||||||
if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){
|
$this->getLevel()->useBreakOn($this);
|
||||||
$this->getLevel()->useBreakOn($this);
|
|
||||||
|
|
||||||
return Level::BLOCK_UPDATE_NORMAL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
public function getFlameEncouragement() : int{
|
||||||
|
return 30;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getFlammability() : int{
|
||||||
|
return 20;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -38,9 +38,13 @@ class Carrot extends Crops{
|
|||||||
return "Carrot Block";
|
return "Carrot Block";
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [
|
return [
|
||||||
ItemFactory::get(Item::CARROT, 0, $this->meta >= 0x07 ? mt_rand(1, 4) : 1)
|
ItemFactory::get(Item::CARROT, 0, $this->meta >= 0x07 ? mt_rand(1, 4) : 1)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function getPickedItem() : Item{
|
||||||
|
return ItemFactory::get(Item::CARROT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -24,10 +24,8 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
use pocketmine\math\AxisAlignedBB;
|
use pocketmine\math\AxisAlignedBB;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\nbt\tag\StringTag;
|
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
use pocketmine\tile\Chest as TileChest;
|
use pocketmine\tile\Chest as TileChest;
|
||||||
use pocketmine\tile\Tile;
|
use pocketmine\tile\Tile;
|
||||||
@ -49,21 +47,22 @@ class Chest extends Transparent{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_AXE;
|
return BlockToolType::TYPE_AXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function recalculateBoundingBox() : ?AxisAlignedBB{
|
protected function recalculateBoundingBox() : ?AxisAlignedBB{
|
||||||
|
//these are slightly bigger than in PC
|
||||||
return new AxisAlignedBB(
|
return new AxisAlignedBB(
|
||||||
$this->x + 0.0625,
|
$this->x + 0.025,
|
||||||
$this->y,
|
$this->y,
|
||||||
$this->z + 0.0625,
|
$this->z + 0.025,
|
||||||
$this->x + 0.9375,
|
$this->x + 0.975,
|
||||||
$this->y + 0.9475,
|
$this->y + 0.95,
|
||||||
$this->z + 0.9375
|
$this->z + 0.975
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
$faces = [
|
$faces = [
|
||||||
0 => 4,
|
0 => 4,
|
||||||
1 => 2,
|
1 => 2,
|
||||||
@ -101,16 +100,6 @@ class Chest extends Transparent{
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onBreak(Item $item, Player $player = null) : bool{
|
|
||||||
$t = $this->getLevel()->getTile($this);
|
|
||||||
if($t instanceof TileChest){
|
|
||||||
$t->unpair();
|
|
||||||
}
|
|
||||||
$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true, true);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function onActivate(Item $item, Player $player = null) : bool{
|
public function onActivate(Item $item, Player $player = null) : bool{
|
||||||
if($player instanceof Player){
|
if($player instanceof Player){
|
||||||
|
|
||||||
@ -125,7 +114,7 @@ class Chest extends Transparent{
|
|||||||
if(
|
if(
|
||||||
!$this->getSide(Vector3::SIDE_UP)->isTransparent() or
|
!$this->getSide(Vector3::SIDE_UP)->isTransparent() or
|
||||||
($chest->isPaired() and !$chest->getPair()->getBlock()->getSide(Vector3::SIDE_UP)->isTransparent()) or
|
($chest->isPaired() and !$chest->getPair()->getBlock()->getSide(Vector3::SIDE_UP)->isTransparent()) or
|
||||||
(isset($chest->namedtag->Lock) and $chest->namedtag->Lock instanceof StringTag and $chest->namedtag->Lock->getValue() !== $item->getCustomName())
|
!$chest->canOpenWith($item->getCustomName())
|
||||||
){
|
){
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -143,4 +132,4 @@ class Chest extends Transparent{
|
|||||||
public function getFuelTime() : int{
|
public function getFuelTime() : int{
|
||||||
return 300;
|
return 300;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,6 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\ItemFactory;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class Clay extends Solid{
|
class Clay extends Solid{
|
||||||
|
|
||||||
@ -40,16 +39,16 @@ class Clay extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_SHOVEL;
|
return BlockToolType::TYPE_SHOVEL;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName() : string{
|
public function getName() : string{
|
||||||
return "Clay Block";
|
return "Clay Block";
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [
|
return [
|
||||||
ItemFactory::get(Item::CLAY_BALL, 0, 4)
|
ItemFactory::get(Item::CLAY_BALL, 0, 4)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,8 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class Coal extends Solid{
|
class Coal extends Solid{
|
||||||
|
|
||||||
@ -39,22 +38,26 @@ class Coal extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName() : string{
|
public function getName() : string{
|
||||||
return "Coal Block";
|
return "Coal Block";
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
|
||||||
if($item->isPickaxe() >= Tool::TIER_WOODEN){
|
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getFuelTime() : int{
|
public function getFuelTime() : int{
|
||||||
return 16000;
|
return 16000;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function getFlameEncouragement() : int{
|
||||||
|
return 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getFlammability() : int{
|
||||||
|
return 5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -25,7 +25,7 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\ItemFactory;
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\TieredTool;
|
||||||
|
|
||||||
class CoalOre extends Solid{
|
class CoalOre extends Solid{
|
||||||
|
|
||||||
@ -40,21 +40,24 @@ class CoalOre extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName() : string{
|
public function getName() : string{
|
||||||
return "Coal Ore";
|
return "Coal Ore";
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
if($item->isPickaxe() >= Tool::TIER_WOODEN){
|
return [
|
||||||
return [
|
ItemFactory::get(Item::COAL)
|
||||||
ItemFactory::get(Item::COAL, 0, 1)
|
];
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
public function getXpDropForTool(Item $item) : int{
|
||||||
|
return mt_rand(0, 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -23,8 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class Cobblestone extends Solid{
|
class Cobblestone extends Solid{
|
||||||
|
|
||||||
@ -35,7 +34,11 @@ class Cobblestone extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName() : string{
|
public function getName() : string{
|
||||||
@ -45,12 +48,4 @@ class Cobblestone extends Solid{
|
|||||||
public function getHardness() : float{
|
public function getHardness() : float{
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public function getDrops(Item $item) : array{
|
|
||||||
if($item->isPickaxe() >= Tool::TIER_WOODEN){
|
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -23,7 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\TieredTool;
|
||||||
|
|
||||||
class CobblestoneStairs extends Stair{
|
class CobblestoneStairs extends Stair{
|
||||||
|
|
||||||
@ -38,11 +38,14 @@ class CobblestoneStairs extends Stair{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName() : string{
|
public function getName() : string{
|
||||||
return "Cobblestone Stairs";
|
return "Cobblestone Stairs";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
@ -23,13 +23,13 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\math\AxisAlignedBB;
|
use pocketmine\math\AxisAlignedBB;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
|
|
||||||
class CobblestoneWall extends Transparent{
|
class CobblestoneWall extends Transparent{
|
||||||
const NONE_MOSSY_WALL = 0;
|
public const NONE_MOSSY_WALL = 0;
|
||||||
const MOSSY_WALL = 1;
|
public const MOSSY_WALL = 1;
|
||||||
|
|
||||||
protected $id = self::COBBLESTONE_WALL;
|
protected $id = self::COBBLESTONE_WALL;
|
||||||
|
|
||||||
@ -38,7 +38,11 @@ class CobblestoneWall extends Transparent{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getHardness() : float{
|
public function getHardness() : float{
|
||||||
@ -86,5 +90,4 @@ class CobblestoneWall extends Transparent{
|
|||||||
public function canConnect(Block $block){
|
public function canConnect(Block $block){
|
||||||
return $block instanceof static or $block instanceof FenceGate or ($block->isSolid() and !$block->isTransparent());
|
return $block instanceof static or $block instanceof FenceGate or ($block->isSolid() and !$block->isTransparent());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\entity\Entity;
|
use pocketmine\entity\Entity;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\ItemFactory;
|
||||||
|
|
||||||
class Cobweb extends Flowable{
|
class Cobweb extends Flowable{
|
||||||
|
|
||||||
@ -48,19 +48,24 @@ class Cobweb extends Flowable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_SWORD;
|
return BlockToolType::TYPE_SWORD | BlockToolType::TYPE_SHEARS;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onEntityCollide(Entity $entity) : void{
|
public function onEntityCollide(Entity $entity) : void{
|
||||||
$entity->resetFallDistance();
|
$entity->resetFallDistance();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
//TODO: correct drops
|
return [
|
||||||
return [];
|
ItemFactory::get(Item::STRING)
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function diffusesSkyLight() : bool{
|
public function diffusesSkyLight() : bool{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -35,5 +35,17 @@ class CocoaBlock extends Transparent{
|
|||||||
return "Cocoa Block";
|
return "Cocoa Block";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getHardness() : float{
|
||||||
|
return 0.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolType() : int{
|
||||||
|
return BlockToolType::TYPE_AXE;
|
||||||
|
}
|
||||||
|
|
||||||
//TODO
|
//TODO
|
||||||
|
|
||||||
|
public function isAffectedBySilkTouch() : bool{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,8 +24,7 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\block\utils\ColorBlockMetaHelper;
|
use pocketmine\block\utils\ColorBlockMetaHelper;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class Concrete extends Solid{
|
class Concrete extends Solid{
|
||||||
|
|
||||||
@ -44,15 +43,10 @@ class Concrete extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getToolHarvestLevel() : int{
|
||||||
if($item->isPickaxe() >= Tool::TIER_WOODEN){
|
return TieredTool::TIER_WOODEN;
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
@ -24,8 +24,6 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\block\utils\ColorBlockMetaHelper;
|
use pocketmine\block\utils\ColorBlockMetaHelper;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
use pocketmine\level\Level;
|
|
||||||
|
|
||||||
class ConcretePowder extends Fallable{
|
class ConcretePowder extends Fallable{
|
||||||
|
|
||||||
@ -44,16 +42,15 @@ class ConcretePowder extends Fallable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_SHOVEL;
|
return BlockToolType::TYPE_SHOVEL;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onNearbyBlockChange() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL and ($block = $this->checkAdjacentWater()) !== null){
|
if(($block = $this->checkAdjacentWater()) !== null){
|
||||||
$this->level->setBlock($this, $block);
|
$this->level->setBlock($this, $block);
|
||||||
return $type;
|
}else{
|
||||||
|
parent::onNearbyBlockChange();
|
||||||
}
|
}
|
||||||
|
|
||||||
return parent::onUpdate($type);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -69,10 +66,10 @@ class ConcretePowder extends Fallable{
|
|||||||
private function checkAdjacentWater() : ?Block{
|
private function checkAdjacentWater() : ?Block{
|
||||||
for($i = 1; $i < 6; ++$i){ //Do not check underneath
|
for($i = 1; $i < 6; ++$i){ //Do not check underneath
|
||||||
if($this->getSide($i) instanceof Water){
|
if($this->getSide($i) instanceof Water){
|
||||||
return Block::get(Block::CONCRETE, $this->meta);
|
return BlockFactory::get(Block::CONCRETE, $this->meta);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,9 +23,8 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\inventory\BigCraftingGrid;
|
use pocketmine\inventory\CraftingGrid;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
|
|
||||||
class CraftingTable extends Solid{
|
class CraftingTable extends Solid{
|
||||||
@ -45,13 +44,12 @@ class CraftingTable extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_AXE;
|
return BlockToolType::TYPE_AXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onActivate(Item $item, Player $player = null) : bool{
|
public function onActivate(Item $item, Player $player = null) : bool{
|
||||||
if($player instanceof Player){
|
if($player instanceof Player){
|
||||||
$player->setCraftingGrid(new BigCraftingGrid($player));
|
$player->setCraftingGrid(new CraftingGrid($player, CraftingGrid::SIZE_BIG));
|
||||||
$player->craftingType = 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -60,4 +58,4 @@ class CraftingTable extends Solid{
|
|||||||
public function getFuelTime() : int{
|
public function getFuelTime() : int{
|
||||||
return 300;
|
return 300;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,14 +25,13 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\event\block\BlockGrowEvent;
|
use pocketmine\event\block\BlockGrowEvent;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
use pocketmine\Server;
|
use pocketmine\Server;
|
||||||
|
|
||||||
abstract class Crops extends Flowable{
|
abstract class Crops extends Flowable{
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
if($blockReplace->getSide(Vector3::SIDE_DOWN)->getId() === Block::FARMLAND){
|
if($blockReplace->getSide(Vector3::SIDE_DOWN)->getId() === Block::FARMLAND){
|
||||||
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
||||||
|
|
||||||
@ -65,34 +64,31 @@ abstract class Crops extends Flowable{
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function onNearbyBlockChange() : void{
|
||||||
|
if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::FARMLAND){
|
||||||
|
$this->getLevel()->useBreakOn($this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function ticksRandomly() : bool{
|
public function ticksRandomly() : bool{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onRandomTick() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL){
|
if(mt_rand(0, 2) === 1){
|
||||||
if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::FARMLAND){
|
if($this->meta < 0x07){
|
||||||
$this->getLevel()->useBreakOn($this);
|
$block = clone $this;
|
||||||
return Level::BLOCK_UPDATE_NORMAL;
|
++$block->meta;
|
||||||
}
|
Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
|
||||||
}elseif($type === Level::BLOCK_UPDATE_RANDOM){
|
|
||||||
if(mt_rand(0, 2) === 1){
|
|
||||||
if($this->meta < 0x07){
|
|
||||||
$block = clone $this;
|
|
||||||
++$block->meta;
|
|
||||||
Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
|
|
||||||
|
|
||||||
if(!$ev->isCancelled()){
|
if(!$ev->isCancelled()){
|
||||||
$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
|
$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
|
||||||
}else{
|
|
||||||
return Level::BLOCK_UPDATE_RANDOM;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}else{
|
|
||||||
return Level::BLOCK_UPDATE_RANDOM;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function isAffectedBySilkTouch() : bool{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,6 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
|
|
||||||
@ -41,7 +40,7 @@ class Dandelion extends Flowable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
$down = $this->getSide(Vector3::SIDE_DOWN);
|
$down = $this->getSide(Vector3::SIDE_DOWN);
|
||||||
if($down->getId() === Block::GRASS or $down->getId() === Block::DIRT or $down->getId() === Block::FARMLAND){
|
if($down->getId() === Block::GRASS or $down->getId() === Block::DIRT or $down->getId() === Block::FARMLAND){
|
||||||
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
||||||
@ -52,15 +51,17 @@ class Dandelion extends Flowable{
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onNearbyBlockChange() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL){
|
if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
|
||||||
if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
|
$this->getLevel()->useBreakOn($this);
|
||||||
$this->getLevel()->useBreakOn($this);
|
|
||||||
|
|
||||||
return Level::BLOCK_UPDATE_NORMAL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function getFlameEncouragement() : int{
|
||||||
|
return 60;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getFlammability() : int{
|
||||||
|
return 100;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -43,5 +43,9 @@ class DaylightSensor extends Transparent{
|
|||||||
return 300;
|
return 300;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getToolType() : int{
|
||||||
|
return BlockToolType::TYPE_AXE;
|
||||||
|
}
|
||||||
|
|
||||||
//TODO
|
//TODO
|
||||||
}
|
}
|
||||||
|
@ -25,9 +25,8 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\ItemFactory;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
|
use pocketmine\Player;
|
||||||
|
|
||||||
class DeadBush extends Flowable{
|
class DeadBush extends Flowable{
|
||||||
|
|
||||||
@ -41,29 +40,43 @@ class DeadBush extends Flowable{
|
|||||||
return "Dead Bush";
|
return "Dead Bush";
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL){
|
if(!$this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
|
||||||
if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
|
return parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player);
|
||||||
$this->getLevel()->useBreakOn($this);
|
|
||||||
|
|
||||||
return Level::BLOCK_UPDATE_NORMAL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function onNearbyBlockChange() : void{
|
||||||
|
if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
|
||||||
|
$this->getLevel()->useBreakOn($this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_SHEARS;
|
return BlockToolType::TYPE_SHEARS;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDrops(Item $item) : array{
|
||||||
if($item->isShears()){
|
if(!$this->isCompatibleWithTool($item)){
|
||||||
return parent::getDrops($item);
|
return [
|
||||||
|
ItemFactory::get(Item::STICK, 0, mt_rand(0, 2))
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return parent::getDrops($item);
|
||||||
ItemFactory::get(Item::STICK, 0, mt_rand(0, 2))
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function getFlameEncouragement() : int{
|
||||||
|
return 60;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getFlammability() : int{
|
||||||
|
return 100;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -23,8 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class Diamond extends Solid{
|
class Diamond extends Solid{
|
||||||
|
|
||||||
@ -43,14 +42,10 @@ class Diamond extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getToolHarvestLevel() : int{
|
||||||
if($item->isPickaxe() >= Tool::TIER_IRON){
|
return TieredTool::TIER_IRON;
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\ItemFactory;
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\TieredTool;
|
||||||
|
|
||||||
class DiamondOre extends Solid{
|
class DiamondOre extends Solid{
|
||||||
|
|
||||||
@ -44,16 +44,20 @@ class DiamondOre extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getToolHarvestLevel() : int{
|
||||||
if($item->isPickaxe() >= Tool::TIER_IRON){
|
return TieredTool::TIER_IRON;
|
||||||
return [
|
|
||||||
ItemFactory::get(Item::DIAMOND, 0, 1)
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
|
return [
|
||||||
|
ItemFactory::get(Item::DIAMOND)
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getXpDropAmount() : int{
|
||||||
|
return mt_rand(3, 7);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -23,8 +23,8 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
|
use pocketmine\item\Hoe;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
|
|
||||||
class Dirt extends Solid{
|
class Dirt extends Solid{
|
||||||
@ -40,7 +40,7 @@ class Dirt extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_SHOVEL;
|
return BlockToolType::TYPE_SHOVEL;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName() : string{
|
public function getName() : string{
|
||||||
@ -51,8 +51,8 @@ class Dirt extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function onActivate(Item $item, Player $player = null) : bool{
|
public function onActivate(Item $item, Player $player = null) : bool{
|
||||||
if($item->isHoe()){
|
if($item instanceof Hoe){
|
||||||
$item->useOn($this);
|
$item->applyDamage(1);
|
||||||
if($this->meta === 1){
|
if($this->meta === 1){
|
||||||
$this->getLevel()->setBlock($this, BlockFactory::get(Block::DIRT), true);
|
$this->getLevel()->setBlock($this, BlockFactory::get(Block::DIRT), true);
|
||||||
}else{
|
}else{
|
||||||
@ -64,4 +64,4 @@ class Dirt extends Solid{
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,6 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\level\sound\DoorSound;
|
use pocketmine\level\sound\DoorSound;
|
||||||
use pocketmine\math\AxisAlignedBB;
|
use pocketmine\math\AxisAlignedBB;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
@ -201,26 +200,20 @@ abstract class Door extends Transparent{
|
|||||||
return $bb;
|
return $bb;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onNearbyBlockChange() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL){
|
if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
|
||||||
if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
|
$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), false);
|
||||||
$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), false);
|
if($this->getSide(Vector3::SIDE_UP) instanceof Door){
|
||||||
if($this->getSide(Vector3::SIDE_UP) instanceof Door){
|
$this->getLevel()->setBlock($this->getSide(Vector3::SIDE_UP), BlockFactory::get(Block::AIR), false);
|
||||||
$this->getLevel()->setBlock($this->getSide(Vector3::SIDE_UP), BlockFactory::get(Block::AIR), false);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Level::BLOCK_UPDATE_NORMAL;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
if($face === Vector3::SIDE_UP){
|
if($face === Vector3::SIDE_UP){
|
||||||
$blockUp = $this->getSide(Vector3::SIDE_UP);
|
$blockUp = $this->getSide(Vector3::SIDE_UP);
|
||||||
$blockDown = $this->getSide(Vector3::SIDE_DOWN);
|
$blockDown = $this->getSide(Vector3::SIDE_DOWN);
|
||||||
if($blockUp->canBeReplaced() === false or $blockDown->isTransparent() === true){
|
if(!$blockUp->canBeReplaced() or $blockDown->isTransparent()){
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
$direction = $player instanceof Player ? $player->getDirection() : 0;
|
$direction = $player instanceof Player ? $player->getDirection() : 0;
|
||||||
@ -233,36 +226,19 @@ abstract class Door extends Transparent{
|
|||||||
$next = $this->getSide($faces[($direction + 2) % 4]);
|
$next = $this->getSide($faces[($direction + 2) % 4]);
|
||||||
$next2 = $this->getSide($faces[$direction]);
|
$next2 = $this->getSide($faces[$direction]);
|
||||||
$metaUp = 0x08;
|
$metaUp = 0x08;
|
||||||
if($next->getId() === $this->getId() or ($next2->isTransparent() === false and $next->isTransparent() === true)){ //Door hinge
|
if($next->getId() === $this->getId() or (!$next2->isTransparent() and $next->isTransparent())){ //Door hinge
|
||||||
$metaUp |= 0x01;
|
$metaUp |= 0x01;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->setDamage($player->getDirection() & 0x03);
|
$this->setDamage($player->getDirection() & 0x03);
|
||||||
$this->getLevel()->setBlock($blockReplace, $this, true, true); //Bottom
|
$this->getLevel()->setBlock($blockReplace, $this, true, true); //Bottom
|
||||||
$this->getLevel()->setBlock($blockUp, $b = BlockFactory::get($this->getId(), $metaUp), true); //Top
|
$this->getLevel()->setBlock($blockUp, BlockFactory::get($this->getId(), $metaUp), true); //Top
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onBreak(Item $item, Player $player = null) : bool{
|
|
||||||
if(($this->getDamage() & 0x08) === 0x08){
|
|
||||||
$down = $this->getSide(Vector3::SIDE_DOWN);
|
|
||||||
if($down->getId() === $this->getId()){
|
|
||||||
$this->getLevel()->setBlock($down, BlockFactory::get(Block::AIR), true);
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
$up = $this->getSide(Vector3::SIDE_UP);
|
|
||||||
if($up->getId() === $this->getId()){
|
|
||||||
$this->getLevel()->setBlock($up, BlockFactory::get(Block::AIR), true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function onActivate(Item $item, Player $player = null) : bool{
|
public function onActivate(Item $item, Player $player = null) : bool{
|
||||||
if(($this->getDamage() & 0x08) === 0x08){ //Top
|
if(($this->getDamage() & 0x08) === 0x08){ //Top
|
||||||
$down = $this->getSide(Vector3::SIDE_DOWN);
|
$down = $this->getSide(Vector3::SIDE_DOWN);
|
||||||
@ -286,4 +262,32 @@ abstract class Door extends Transparent{
|
|||||||
public function getVariantBitmask() : int{
|
public function getVariantBitmask() : int{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
|
if(($this->meta & 0x08) === 0){ //bottom half only
|
||||||
|
return parent::getDropsForCompatibleTool($item);
|
||||||
|
}
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function isAffectedBySilkTouch() : bool{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getAffectedBlocks() : array{
|
||||||
|
if(($this->getDamage() & 0x08) === 0x08){
|
||||||
|
$down = $this->getSide(Vector3::SIDE_DOWN);
|
||||||
|
if($down->getId() === $this->getId()){
|
||||||
|
return [$this, $down];
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
$up = $this->getSide(Vector3::SIDE_UP);
|
||||||
|
if($up->getId() === $this->getId()){
|
||||||
|
return [$this, $up];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return parent::getAffectedBlocks();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -25,12 +25,11 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\ItemFactory;
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
|
|
||||||
class DoublePlant extends Flowable{
|
class DoublePlant extends Flowable{
|
||||||
const BITFLAG_TOP = 0x08;
|
public const BITFLAG_TOP = 0x08;
|
||||||
|
|
||||||
protected $id = self::DOUBLE_PLANT;
|
protected $id = self::DOUBLE_PLANT;
|
||||||
|
|
||||||
@ -54,7 +53,7 @@ class DoublePlant extends Flowable{
|
|||||||
return $names[$this->getVariant()] ?? "";
|
return $names[$this->getVariant()] ?? "";
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
$id = $blockReplace->getSide(Vector3::SIDE_DOWN)->getId();
|
$id = $blockReplace->getSide(Vector3::SIDE_DOWN)->getId();
|
||||||
if(($id === Block::GRASS or $id === Block::DIRT) and $blockReplace->getSide(Vector3::SIDE_UP)->canBeReplaced()){
|
if(($id === Block::GRASS or $id === Block::DIRT) and $blockReplace->getSide(Vector3::SIDE_UP)->canBeReplaced()){
|
||||||
$this->getLevel()->setBlock($blockReplace, $this, false, false);
|
$this->getLevel()->setBlock($blockReplace, $this, false, false);
|
||||||
@ -84,46 +83,45 @@ class DoublePlant extends Flowable{
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onNearbyBlockChange() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL){
|
if(!$this->isValidHalfPlant() or (($this->meta & self::BITFLAG_TOP) === 0 and $this->getSide(Vector3::SIDE_DOWN)->isTransparent())){
|
||||||
$down = $this->getSide(Vector3::SIDE_DOWN);
|
$this->getLevel()->useBreakOn($this);
|
||||||
if(!$this->isValidHalfPlant() or (($this->meta & self::BITFLAG_TOP) === 0 and $down->isTransparent())){
|
|
||||||
$this->getLevel()->useBreakOn($this);
|
|
||||||
|
|
||||||
return Level::BLOCK_UPDATE_NORMAL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function onBreak(Item $item, Player $player = null) : bool{
|
|
||||||
if(parent::onBreak($item, $player) and $this->isValidHalfPlant()){
|
|
||||||
$this->getLevel()->useBreakOn($this->getSide(($this->meta & self::BITFLAG_TOP) !== 0 ? Vector3::SIDE_DOWN : Vector3::SIDE_UP), $item, $player, $player !== null);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getVariantBitmask() : int{
|
public function getVariantBitmask() : int{
|
||||||
return 0x07;
|
return 0x07;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getToolType() : int{
|
||||||
|
return ($this->meta === 2 or $this->meta === 3) ? BlockToolType::TYPE_SHEARS : BlockToolType::TYPE_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return ($this->meta === 2 or $this->meta === 3) ? 1 : 0; //only grass or fern require shears
|
||||||
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDrops(Item $item) : array{
|
||||||
if($this->meta & self::BITFLAG_TOP){
|
if($this->meta & self::BITFLAG_TOP){
|
||||||
if(!$item->isShears() and ($this->meta === 2 or $this->meta === 3)){ //grass or fern
|
if($this->isCompatibleWithTool($item)){
|
||||||
if(mt_rand(0, 24) === 0){
|
return parent::getDrops($item);
|
||||||
return [
|
|
||||||
ItemFactory::get(Item::SEEDS, 0, 1)
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return parent::getDrops($item);
|
if(mt_rand(0, 24) === 0){
|
||||||
|
return [
|
||||||
|
ItemFactory::get(Item::SEEDS)
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function getAffectedBlocks() : array{
|
||||||
|
if($this->isValidHalfPlant()){
|
||||||
|
return [$this, $this->getSide(($this->meta & self::BITFLAG_TOP) !== 0 ? Vector3::SIDE_DOWN : Vector3::SIDE_UP)];
|
||||||
|
}
|
||||||
|
|
||||||
|
return parent::getAffectedBlocks();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -35,13 +35,16 @@ abstract class DoubleSlab extends Solid{
|
|||||||
abstract public function getSlabId() : int;
|
abstract public function getSlabId() : int;
|
||||||
|
|
||||||
public function getName() : string{
|
public function getName() : string{
|
||||||
return "Double " . BlockFactory::get($this->getSlabId(), $this->getVariant())->getName() . " Slab";
|
return "Double " . BlockFactory::get($this->getSlabId(), $this->getVariant())->getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [
|
return [
|
||||||
ItemFactory::get($this->getSlabId(), $this->getVariant(), 2)
|
ItemFactory::get($this->getSlabId(), $this->getVariant(), 2)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
public function isAffectedBySilkTouch() : bool{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -23,8 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class DoubleStoneSlab extends DoubleSlab{
|
class DoubleStoneSlab extends DoubleSlab{
|
||||||
|
|
||||||
@ -39,15 +38,10 @@ class DoubleStoneSlab extends DoubleSlab{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getToolHarvestLevel() : int{
|
||||||
if($item->isPickaxe() >= Tool::TIER_WOODEN){
|
return TieredTool::TIER_WOODEN;
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
@ -30,5 +30,4 @@ class DoubleStoneSlab2 extends DoubleStoneSlab{
|
|||||||
public function getSlabId() : int{
|
public function getSlabId() : int{
|
||||||
return self::STONE_SLAB2;
|
return self::STONE_SLAB2;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
@ -23,8 +23,6 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class DoubleWoodenSlab extends DoubleSlab{
|
class DoubleWoodenSlab extends DoubleSlab{
|
||||||
|
|
||||||
protected $id = self::DOUBLE_WOODEN_SLAB;
|
protected $id = self::DOUBLE_WOODEN_SLAB;
|
||||||
@ -38,6 +36,14 @@ class DoubleWoodenSlab extends DoubleSlab{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_AXE;
|
return BlockToolType::TYPE_AXE;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function getFlameEncouragement() : int{
|
||||||
|
return 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getFlammability() : int{
|
||||||
|
return 20;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -23,8 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class Emerald extends Solid{
|
class Emerald extends Solid{
|
||||||
|
|
||||||
@ -39,18 +38,14 @@ class Emerald extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_IRON;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName() : string{
|
public function getName() : string{
|
||||||
return "Emerald Block";
|
return "Emerald Block";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public function getDrops(Item $item) : array{
|
|
||||||
if($item->isPickaxe() >= Tool::TIER_IRON){
|
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -25,7 +25,7 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\ItemFactory;
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\TieredTool;
|
||||||
|
|
||||||
class EmeraldOre extends Solid{
|
class EmeraldOre extends Solid{
|
||||||
|
|
||||||
@ -40,20 +40,24 @@ class EmeraldOre extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_IRON;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getHardness() : float{
|
public function getHardness() : float{
|
||||||
return 3;
|
return 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
if($item->isPickaxe() >= Tool::TIER_IRON){
|
return [
|
||||||
return [
|
ItemFactory::get(Item::EMERALD)
|
||||||
ItemFactory::get(Item::EMERALD, 0, 1)
|
];
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
protected function getXpDropAmount() : int{
|
||||||
|
return mt_rand(3, 7);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -25,7 +25,7 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\inventory\EnchantInventory;
|
use pocketmine\inventory\EnchantInventory;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
use pocketmine\tile\EnchantTable as TileEnchantTable;
|
use pocketmine\tile\EnchantTable as TileEnchantTable;
|
||||||
@ -39,7 +39,7 @@ class EnchantingTable extends Transparent{
|
|||||||
$this->meta = $meta;
|
$this->meta = $meta;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
||||||
|
|
||||||
Tile::createTile(Tile::ENCHANT_TABLE, $this->getLevel(), TileEnchantTable::createNBT($this, $face, $item, $player));
|
Tile::createTile(Tile::ENCHANT_TABLE, $this->getLevel(), TileEnchantTable::createNBT($this, $face, $item, $player));
|
||||||
@ -60,7 +60,11 @@ class EnchantingTable extends Transparent{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onActivate(Item $item, Player $player = null) : bool{
|
public function onActivate(Item $item, Player $player = null) : bool{
|
||||||
@ -72,12 +76,4 @@ class EnchantingTable extends Transparent{
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public function getDrops(Item $item) : array{
|
|
||||||
if($item->isPickaxe() >= Tool::TIER_WOODEN){
|
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -65,4 +65,4 @@ class EndPortalFrame extends Solid{
|
|||||||
$this->z + 1
|
$this->z + 1
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,7 @@ class EndRod extends Flowable{
|
|||||||
return "End Rod";
|
return "End Rod";
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
if($face === Vector3::SIDE_UP or $face === Vector3::SIDE_DOWN){
|
if($face === Vector3::SIDE_UP or $face === Vector3::SIDE_DOWN){
|
||||||
$this->meta = $face;
|
$this->meta = $face;
|
||||||
}else{
|
}else{
|
||||||
@ -101,4 +101,4 @@ class EndRod extends Flowable{
|
|||||||
public function getVariantBitmask() : int{
|
public function getVariantBitmask() : int{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\TieredTool;
|
||||||
|
|
||||||
class EndStone extends Solid{
|
class EndStone extends Solid{
|
||||||
|
|
||||||
@ -38,10 +38,14 @@ class EndStone extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getHardness() : float{
|
public function getHardness() : float{
|
||||||
return 3;
|
return 3;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,8 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class EndStoneBricks extends Solid{
|
class EndStoneBricks extends Solid{
|
||||||
|
|
||||||
@ -43,15 +42,10 @@ class EndStoneBricks extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getToolHarvestLevel() : int{
|
||||||
if($item->isPickaxe() >= Tool::TIER_WOODEN){
|
return TieredTool::TIER_WOODEN;
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
109
src/pocketmine/block/EnderChest.php
Normal file
109
src/pocketmine/block/EnderChest.php
Normal file
@ -0,0 +1,109 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* ____ _ _ __ __ _ __ __ ____
|
||||||
|
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
|
||||||
|
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
|
||||||
|
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
|
||||||
|
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* @author PocketMine Team
|
||||||
|
* @link http://www.pocketmine.net/
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace pocketmine\block;
|
||||||
|
|
||||||
|
use pocketmine\item\Item;
|
||||||
|
use pocketmine\item\ItemFactory;
|
||||||
|
use pocketmine\item\TieredTool;
|
||||||
|
use pocketmine\math\Vector3;
|
||||||
|
use pocketmine\Player;
|
||||||
|
use pocketmine\tile\EnderChest as TileEnderChest;
|
||||||
|
use pocketmine\tile\Tile;
|
||||||
|
|
||||||
|
class EnderChest extends Chest{
|
||||||
|
|
||||||
|
protected $id = self::ENDER_CHEST;
|
||||||
|
|
||||||
|
public function getHardness() : float{
|
||||||
|
return 22.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getBlastResistance() : float{
|
||||||
|
return 3000;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getLightLevel() : int{
|
||||||
|
return 7;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getName() : string{
|
||||||
|
return "Ender Chest";
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolType() : int{
|
||||||
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
|
$faces = [
|
||||||
|
0 => 4,
|
||||||
|
1 => 2,
|
||||||
|
2 => 5,
|
||||||
|
3 => 3
|
||||||
|
];
|
||||||
|
|
||||||
|
$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0];
|
||||||
|
|
||||||
|
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
||||||
|
Tile::createTile(Tile::ENDER_CHEST, $this->getLevel(), TileEnderChest::createNBT($this, $face, $item, $player));
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function onActivate(Item $item, Player $player = null) : bool{
|
||||||
|
if($player instanceof Player){
|
||||||
|
|
||||||
|
$t = $this->getLevel()->getTile($this);
|
||||||
|
$enderChest = null;
|
||||||
|
if($t instanceof TileEnderChest){
|
||||||
|
$enderChest = $t;
|
||||||
|
}else{
|
||||||
|
$enderChest = Tile::createTile(Tile::ENDER_CHEST, $this->getLevel(), TileEnderChest::createNBT($this));
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!$this->getSide(Vector3::SIDE_UP)->isTransparent()){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$player->getEnderChestInventory()->setHolderPosition($enderChest);
|
||||||
|
$player->addWindow($player->getEnderChestInventory());
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
|
return [
|
||||||
|
ItemFactory::get(Item::OBSIDIAN, 0, 8)
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getFuelTime() : int{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
@ -24,26 +24,23 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\entity\Entity;
|
use pocketmine\entity\Entity;
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
|
|
||||||
abstract class Fallable extends Solid{
|
abstract class Fallable extends Solid{
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onNearbyBlockChange() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL){
|
$down = $this->getSide(Vector3::SIDE_DOWN);
|
||||||
$down = $this->getSide(Vector3::SIDE_DOWN);
|
if($down->getId() === self::AIR or $down instanceof Liquid or $down instanceof Fire){
|
||||||
if($down->getId() === self::AIR or $down instanceof Liquid or $down instanceof Fire){
|
$this->level->setBlock($this, BlockFactory::get(Block::AIR), true);
|
||||||
$this->level->setBlock($this, BlockFactory::get(Block::AIR), true);
|
|
||||||
|
|
||||||
$nbt = Entity::createBaseNBT($this->add(0.5, 0, 0.5));
|
$nbt = Entity::createBaseNBT($this->add(0.5, 0, 0.5));
|
||||||
$nbt->setInt("TileID", $this->getId());
|
$nbt->setInt("TileID", $this->getId());
|
||||||
$nbt->setByte("Data", $this->getDamage());
|
$nbt->setByte("Data", $this->getDamage());
|
||||||
|
|
||||||
$fall = Entity::createEntity("FallingSand", $this->getLevel(), $nbt);
|
$fall = Entity::createEntity("FallingSand", $this->getLevel(), $nbt);
|
||||||
|
|
||||||
if($fall !== null){
|
if($fall !== null){
|
||||||
$fall->spawnToAll();
|
$fall->spawnToAll();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -54,4 +51,4 @@ abstract class Fallable extends Solid{
|
|||||||
public function tickFalling() : ?Block{
|
public function tickFalling() : ?Block{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,8 +25,6 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\ItemFactory;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\math\AxisAlignedBB;
|
use pocketmine\math\AxisAlignedBB;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
|
|
||||||
@ -47,12 +45,9 @@ class Farmland extends Transparent{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_SHOVEL;
|
return BlockToolType::TYPE_SHOVEL;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function ticksRandomly() : bool{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function recalculateBoundingBox() : ?AxisAlignedBB{
|
protected function recalculateBoundingBox() : ?AxisAlignedBB{
|
||||||
return new AxisAlignedBB(
|
return new AxisAlignedBB(
|
||||||
@ -65,29 +60,28 @@ class Farmland extends Transparent{
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onNearbyBlockChange() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL and $this->getSide(Vector3::SIDE_UP)->isSolid()){
|
if($this->getSide(Vector3::SIDE_UP)->isSolid()){
|
||||||
$this->level->setBlock($this, BlockFactory::get(Block::DIRT), true);
|
$this->level->setBlock($this, BlockFactory::get(Block::DIRT), true);
|
||||||
return $type;
|
|
||||||
}elseif($type === Level::BLOCK_UPDATE_RANDOM){
|
|
||||||
if(!$this->canHydrate()){
|
|
||||||
if($this->meta > 0){
|
|
||||||
$this->meta--;
|
|
||||||
$this->level->setBlock($this, $this, false, false);
|
|
||||||
}else{
|
|
||||||
$this->level->setBlock($this, BlockFactory::get(Block::DIRT), false, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $type;
|
|
||||||
}elseif($this->meta < 7){
|
|
||||||
$this->meta = 7;
|
|
||||||
$this->level->setBlock($this, $this, false, false);
|
|
||||||
|
|
||||||
return $type;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
public function ticksRandomly() : bool{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function onRandomTick() : void{
|
||||||
|
if(!$this->canHydrate()){
|
||||||
|
if($this->meta > 0){
|
||||||
|
$this->meta--;
|
||||||
|
$this->level->setBlock($this, $this, false, false);
|
||||||
|
}else{
|
||||||
|
$this->level->setBlock($this, BlockFactory::get(Block::DIRT), false, true);
|
||||||
|
}
|
||||||
|
}elseif($this->meta < 7){
|
||||||
|
$this->meta = 7;
|
||||||
|
$this->level->setBlock($this, $this, false, false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function canHydrate() : bool{
|
protected function canHydrate() : bool{
|
||||||
@ -108,9 +102,13 @@ class Farmland extends Transparent{
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [
|
return [
|
||||||
ItemFactory::get(Item::DIRT, 0, 1)
|
ItemFactory::get(Item::DIRT)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function isAffectedBySilkTouch() : bool{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -105,5 +105,4 @@ abstract class Fence extends Transparent{
|
|||||||
public function canConnect(Block $block){
|
public function canConnect(Block $block){
|
||||||
return $block instanceof static or $block instanceof FenceGate or ($block->isSolid() and !$block->isTransparent());
|
return $block instanceof static or $block instanceof FenceGate or ($block->isSolid() and !$block->isTransparent());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,6 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
use pocketmine\level\sound\DoorSound;
|
use pocketmine\level\sound\DoorSound;
|
||||||
use pocketmine\math\AxisAlignedBB;
|
use pocketmine\math\AxisAlignedBB;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
@ -37,7 +36,7 @@ class FenceGate extends Transparent{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_AXE;
|
return BlockToolType::TYPE_AXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -69,7 +68,7 @@ class FenceGate extends Transparent{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
$this->meta = ($player instanceof Player ? ($player->getDirection() - 1) & 0x03 : 0);
|
$this->meta = ($player instanceof Player ? ($player->getDirection() - 1) & 0x03 : 0);
|
||||||
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
||||||
|
|
||||||
@ -95,4 +94,12 @@ class FenceGate extends Transparent{
|
|||||||
public function getFuelTime() : int{
|
public function getFuelTime() : int{
|
||||||
return 300;
|
return 300;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getFlameEncouragement() : int{
|
||||||
|
return 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getFlammability() : int{
|
||||||
|
return 20;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,11 +25,11 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\entity\Entity;
|
use pocketmine\entity\Entity;
|
||||||
use pocketmine\entity\projectile\Arrow;
|
use pocketmine\entity\projectile\Arrow;
|
||||||
|
use pocketmine\event\block\BlockBurnEvent;
|
||||||
use pocketmine\event\entity\EntityCombustByBlockEvent;
|
use pocketmine\event\entity\EntityCombustByBlockEvent;
|
||||||
use pocketmine\event\entity\EntityDamageByBlockEvent;
|
use pocketmine\event\entity\EntityDamageByBlockEvent;
|
||||||
use pocketmine\event\entity\EntityDamageEvent;
|
use pocketmine\event\entity\EntityDamageEvent;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\Server;
|
use pocketmine\Server;
|
||||||
|
|
||||||
@ -61,10 +61,6 @@ class Fire extends Flowable{
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function ticksRandomly() : bool{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function onEntityCollide(Entity $entity) : void{
|
public function onEntityCollide(Entity $entity) : void{
|
||||||
$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);
|
$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);
|
||||||
$entity->attack($ev);
|
$entity->attack($ev);
|
||||||
@ -79,39 +75,94 @@ class Fire extends Flowable{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onNearbyBlockChange() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL){
|
if(!$this->getSide(Vector3::SIDE_DOWN)->isSolid() and !$this->hasAdjacentFlammableBlocks()){
|
||||||
for($s = 0; $s <= 5; ++$s){
|
|
||||||
$side = $this->getSide($s);
|
|
||||||
if($side->getId() !== self::AIR and !($side instanceof Liquid)){
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
|
$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
|
||||||
|
}else{
|
||||||
|
$this->level->scheduleDelayedBlockUpdate($this, mt_rand(30, 40));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return Level::BLOCK_UPDATE_NORMAL;
|
public function ticksRandomly() : bool{
|
||||||
}elseif($type === Level::BLOCK_UPDATE_RANDOM){
|
return true;
|
||||||
if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::NETHERRACK){
|
}
|
||||||
if(mt_rand(0, 2) === 0){
|
|
||||||
if($this->meta === 0x0F){
|
|
||||||
$this->level->setBlock($this, BlockFactory::get(Block::AIR));
|
|
||||||
}else{
|
|
||||||
$this->meta++;
|
|
||||||
$this->level->setBlock($this, $this);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Level::BLOCK_UPDATE_NORMAL;
|
public function onRandomTick() : void{
|
||||||
|
$down = $this->getSide(Vector3::SIDE_DOWN);
|
||||||
|
|
||||||
|
$result = null;
|
||||||
|
if($this->meta < 15 and mt_rand(0, 2) === 0){
|
||||||
|
$this->meta++;
|
||||||
|
$result = $this;
|
||||||
|
}
|
||||||
|
$canSpread = true;
|
||||||
|
|
||||||
|
if(!$down->burnsForever()){
|
||||||
|
//TODO: check rain
|
||||||
|
if($this->meta === 15){
|
||||||
|
if(!$down->isFlammable() and mt_rand(0, 3) === 3){ //1/4 chance to extinguish
|
||||||
|
$canSpread = false;
|
||||||
|
$result = BlockFactory::get(Block::AIR);
|
||||||
|
}
|
||||||
|
}elseif(!$this->hasAdjacentFlammableBlocks()){
|
||||||
|
$canSpread = false;
|
||||||
|
if(!$down->isSolid() or $this->meta > 3){ //fire older than 3, or without a solid block below
|
||||||
|
$result = BlockFactory::get(Block::AIR);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if($result !== null){
|
||||||
|
$this->level->setBlock($this, $result);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->level->scheduleDelayedBlockUpdate($this, mt_rand(30, 40));
|
||||||
|
|
||||||
|
if($canSpread){
|
||||||
|
//TODO: raise upper bound for chance in humid biomes
|
||||||
|
|
||||||
|
foreach($this->getHorizontalSides() as $side){
|
||||||
|
$this->burnBlock($side, 300);
|
||||||
|
}
|
||||||
|
|
||||||
|
//vanilla uses a 250 upper bound here, but I don't think they intended to increase the chance of incineration
|
||||||
|
$this->burnBlock($this->getSide(Vector3::SIDE_UP), 350);
|
||||||
|
$this->burnBlock($this->getSide(Vector3::SIDE_DOWN), 350);
|
||||||
|
|
||||||
//TODO: fire spread
|
//TODO: fire spread
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function onScheduledUpdate() : void{
|
||||||
|
$this->onRandomTick();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function hasAdjacentFlammableBlocks() : bool{
|
||||||
|
for($i = 0; $i <= 5; ++$i){
|
||||||
|
if($this->getSide($i)->isFlammable()){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
private function burnBlock(Block $block, int $chanceBound) : void{
|
||||||
|
if(mt_rand(0, $chanceBound) < $block->getFlammability()){
|
||||||
|
$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockBurnEvent($block, $this));
|
||||||
|
if(!$ev->isCancelled()){
|
||||||
|
$block->onIncinerate();
|
||||||
|
|
||||||
|
if(mt_rand(0, $this->meta + 9) < 5){ //TODO: check rain
|
||||||
|
$this->level->setBlock($block, BlockFactory::get(Block::FIRE, min(15, $this->meta + (mt_rand(0, 4) >> 2))));
|
||||||
|
}else{
|
||||||
|
$this->level->setBlock($block, BlockFactory::get(Block::AIR));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -42,4 +42,4 @@ abstract class Flowable extends Transparent{
|
|||||||
protected function recalculateBoundingBox() : ?AxisAlignedBB{
|
protected function recalculateBoundingBox() : ?AxisAlignedBB{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,20 +24,19 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
|
|
||||||
class Flower extends Flowable{
|
class Flower extends Flowable{
|
||||||
const TYPE_POPPY = 0;
|
public const TYPE_POPPY = 0;
|
||||||
const TYPE_BLUE_ORCHID = 1;
|
public const TYPE_BLUE_ORCHID = 1;
|
||||||
const TYPE_ALLIUM = 2;
|
public const TYPE_ALLIUM = 2;
|
||||||
const TYPE_AZURE_BLUET = 3;
|
public const TYPE_AZURE_BLUET = 3;
|
||||||
const TYPE_RED_TULIP = 4;
|
public const TYPE_RED_TULIP = 4;
|
||||||
const TYPE_ORANGE_TULIP = 5;
|
public const TYPE_ORANGE_TULIP = 5;
|
||||||
const TYPE_WHITE_TULIP = 6;
|
public const TYPE_WHITE_TULIP = 6;
|
||||||
const TYPE_PINK_TULIP = 7;
|
public const TYPE_PINK_TULIP = 7;
|
||||||
const TYPE_OXEYE_DAISY = 8;
|
public const TYPE_OXEYE_DAISY = 8;
|
||||||
|
|
||||||
protected $id = self::RED_FLOWER;
|
protected $id = self::RED_FLOWER;
|
||||||
|
|
||||||
@ -60,7 +59,7 @@ class Flower extends Flowable{
|
|||||||
return $names[$this->meta] ?? "Unknown";
|
return $names[$this->meta] ?? "Unknown";
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
$down = $this->getSide(Vector3::SIDE_DOWN);
|
$down = $this->getSide(Vector3::SIDE_DOWN);
|
||||||
if($down->getId() === Block::GRASS or $down->getId() === Block::DIRT or $down->getId() === Block::FARMLAND){
|
if($down->getId() === Block::GRASS or $down->getId() === Block::DIRT or $down->getId() === Block::FARMLAND){
|
||||||
$this->getLevel()->setBlock($blockReplace, $this, true);
|
$this->getLevel()->setBlock($blockReplace, $this, true);
|
||||||
@ -71,15 +70,17 @@ class Flower extends Flowable{
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onNearbyBlockChange() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL){
|
if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
|
||||||
if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
|
$this->getLevel()->useBreakOn($this);
|
||||||
$this->getLevel()->useBreakOn($this);
|
|
||||||
|
|
||||||
return Level::BLOCK_UPDATE_NORMAL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function getFlameEncouragement() : int{
|
||||||
|
return 60;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getFlammability() : int{
|
||||||
|
return 100;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -24,7 +24,6 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\math\AxisAlignedBB;
|
use pocketmine\math\AxisAlignedBB;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
@ -33,8 +32,8 @@ use pocketmine\tile\Tile;
|
|||||||
|
|
||||||
class FlowerPot extends Flowable{
|
class FlowerPot extends Flowable{
|
||||||
|
|
||||||
const STATE_EMPTY = 0;
|
public const STATE_EMPTY = 0;
|
||||||
const STATE_FULL = 1;
|
public const STATE_FULL = 1;
|
||||||
|
|
||||||
protected $id = self::FLOWER_POT_BLOCK;
|
protected $id = self::FLOWER_POT_BLOCK;
|
||||||
protected $itemId = Item::FLOWER_POT;
|
protected $itemId = Item::FLOWER_POT;
|
||||||
@ -58,7 +57,7 @@ class FlowerPot extends Flowable{
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
|
if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -68,16 +67,10 @@ class FlowerPot extends Flowable{
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onNearbyBlockChange() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL){
|
if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
|
||||||
if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
|
$this->getLevel()->useBreakOn($this);
|
||||||
$this->getLevel()->useBreakOn($this);
|
|
||||||
|
|
||||||
return Level::BLOCK_UPDATE_NORMAL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onActivate(Item $item, Player $player = null) : bool{
|
public function onActivate(Item $item, Player $player = null) : bool{
|
||||||
@ -96,8 +89,12 @@ class FlowerPot extends Flowable{
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getVariantBitmask() : int{
|
||||||
$items = parent::getDrops($item);
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
|
$items = parent::getDropsForCompatibleTool($item);
|
||||||
|
|
||||||
$tile = $this->getLevel()->getTile($this);
|
$tile = $this->getLevel()->getTile($this);
|
||||||
if($tile instanceof TileFlowerPot){
|
if($tile instanceof TileFlowerPot){
|
||||||
@ -110,4 +107,7 @@ class FlowerPot extends Flowable{
|
|||||||
return $items;
|
return $items;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
public function isAffectedBySilkTouch() : bool{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -35,4 +35,4 @@ class Furnace extends BurningFurnace{
|
|||||||
public function getLightLevel() : int{
|
public function getLightLevel() : int{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -41,7 +41,7 @@ class Glass extends Transparent{
|
|||||||
return 0.3;
|
return 0.3;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -41,7 +41,7 @@ class GlassPane extends Thin{
|
|||||||
return 0.3;
|
return 0.3;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
|
|
||||||
@ -36,10 +36,14 @@ class GlazedTerracotta extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
if($player !== null){
|
if($player !== null){
|
||||||
$faces = [
|
$faces = [
|
||||||
0 => 4,
|
0 => 4,
|
||||||
@ -56,12 +60,4 @@ class GlazedTerracotta extends Solid{
|
|||||||
public function getVariantBitmask() : int{
|
public function getVariantBitmask() : int{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public function getDrops(Item $item) : array{
|
|
||||||
if($item->isPickaxe() >= Tool::TIER_WOODEN){
|
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -24,6 +24,8 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
|
|
||||||
|
use pocketmine\item\TieredTool;
|
||||||
|
|
||||||
class GlowingObsidian extends Solid{
|
class GlowingObsidian extends Solid{
|
||||||
|
|
||||||
protected $id = self::GLOWING_OBSIDIAN;
|
protected $id = self::GLOWING_OBSIDIAN;
|
||||||
@ -47,4 +49,12 @@ class GlowingObsidian extends Solid{
|
|||||||
public function getBlastResistance() : float{
|
public function getBlastResistance() : float{
|
||||||
return 50;
|
return 50;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function getToolType() : int{
|
||||||
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_DIAMOND;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -23,12 +23,15 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\level\Level;
|
use pocketmine\item\Item;
|
||||||
|
use pocketmine\Player;
|
||||||
|
|
||||||
class GlowingRedstoneOre extends RedstoneOre{
|
class GlowingRedstoneOre extends RedstoneOre{
|
||||||
|
|
||||||
protected $id = self::GLOWING_REDSTONE_ORE;
|
protected $id = self::GLOWING_REDSTONE_ORE;
|
||||||
|
|
||||||
|
protected $itemId = self::REDSTONE_ORE;
|
||||||
|
|
||||||
public function getName() : string{
|
public function getName() : string{
|
||||||
return "Glowing Redstone Ore";
|
return "Glowing Redstone Ore";
|
||||||
}
|
}
|
||||||
@ -37,13 +40,19 @@ class GlowingRedstoneOre extends RedstoneOre{
|
|||||||
return 9;
|
return 9;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onActivate(Item $item, Player $player = null) : bool{
|
||||||
if($type === Level::BLOCK_UPDATE_SCHEDULED or $type === Level::BLOCK_UPDATE_RANDOM){
|
|
||||||
$this->getLevel()->setBlock($this, BlockFactory::get(Block::REDSTONE_ORE, $this->meta), false, false);
|
|
||||||
|
|
||||||
return Level::BLOCK_UPDATE_WEAK;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function onNearbyBlockChange() : void{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public function ticksRandomly() : bool{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function onRandomTick() : void{
|
||||||
|
$this->getLevel()->setBlock($this, BlockFactory::get(Block::REDSTONE_ORE, $this->meta), false, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -25,7 +25,6 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\ItemFactory;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class Glowstone extends Transparent{
|
class Glowstone extends Transparent{
|
||||||
|
|
||||||
@ -44,16 +43,16 @@ class Glowstone extends Transparent{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getLightLevel() : int{
|
public function getLightLevel() : int{
|
||||||
return 15;
|
return 15;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [
|
return [
|
||||||
ItemFactory::get(Item::GLOWSTONE_DUST, 0, mt_rand(2, 4))
|
ItemFactory::get(Item::GLOWSTONE_DUST, 0, mt_rand(2, 4))
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,8 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class Gold extends Solid{
|
class Gold extends Solid{
|
||||||
|
|
||||||
@ -43,14 +42,10 @@ class Gold extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getToolHarvestLevel() : int{
|
||||||
if($item->isPickaxe() >= Tool::TIER_IRON){
|
return TieredTool::TIER_IRON;
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,8 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class GoldOre extends Solid{
|
class GoldOre extends Solid{
|
||||||
|
|
||||||
@ -43,14 +42,10 @@ class GoldOre extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getToolHarvestLevel() : int{
|
||||||
if($item->isPickaxe() >= Tool::TIER_IRON){
|
return TieredTool::TIER_IRON;
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,11 +24,11 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\event\block\BlockSpreadEvent;
|
use pocketmine\event\block\BlockSpreadEvent;
|
||||||
|
use pocketmine\item\Hoe;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\ItemFactory;
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\Shovel;
|
||||||
use pocketmine\level\generator\object\TallGrass as TallGrassObject;
|
use pocketmine\level\generator\object\TallGrass as TallGrassObject;
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
use pocketmine\utils\Random;
|
use pocketmine\utils\Random;
|
||||||
@ -50,12 +50,12 @@ class Grass extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_SHOVEL;
|
return BlockToolType::TYPE_SHOVEL;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [
|
return [
|
||||||
ItemFactory::get(Item::DIRT, 0, 1)
|
ItemFactory::get(Item::DIRT)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -63,43 +63,35 @@ class Grass extends Solid{
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onRandomTick() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_RANDOM){
|
$lightAbove = $this->level->getFullLightAt($this->x, $this->y + 1, $this->z);
|
||||||
$lightAbove = $this->level->getFullLightAt($this->x, $this->y + 1, $this->z);
|
if($lightAbove < 4 and BlockFactory::$lightFilter[$this->level->getBlockIdAt($this->x, $this->y + 1, $this->z)] >= 3){ //2 plus 1 standard filter amount
|
||||||
if($lightAbove < 4 and BlockFactory::$lightFilter[$this->level->getBlockIdAt($this->x, $this->y + 1, $this->z)] >= 3){ //2 plus 1 standard filter amount
|
//grass dies
|
||||||
//grass dies
|
$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($this, $this, BlockFactory::get(Block::DIRT)));
|
||||||
$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($this, $this, BlockFactory::get(Block::DIRT)));
|
if(!$ev->isCancelled()){
|
||||||
|
$this->level->setBlock($this, $ev->getNewState(), false, false);
|
||||||
|
}
|
||||||
|
}elseif($lightAbove >= 9){
|
||||||
|
//try grass spread
|
||||||
|
for($i = 0; $i < 4; ++$i){
|
||||||
|
$x = mt_rand($this->x - 1, $this->x + 1);
|
||||||
|
$y = mt_rand($this->y - 3, $this->y + 1);
|
||||||
|
$z = mt_rand($this->z - 1, $this->z + 1);
|
||||||
|
if(
|
||||||
|
$this->level->getBlockIdAt($x, $y, $z) !== Block::DIRT or
|
||||||
|
$this->level->getBlockDataAt($x, $y, $z) === 1 or
|
||||||
|
$this->level->getFullLightAt($x, $y + 1, $z) < 4 or
|
||||||
|
BlockFactory::$lightFilter[$this->level->getBlockIdAt($x, $y + 1, $z)] >= 3
|
||||||
|
){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($b = $this->level->getBlockAt($x, $y, $z), $this, BlockFactory::get(Block::GRASS)));
|
||||||
if(!$ev->isCancelled()){
|
if(!$ev->isCancelled()){
|
||||||
$this->level->setBlock($this, $ev->getNewState(), false, false);
|
$this->level->setBlock($b, $ev->getNewState(), false, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Level::BLOCK_UPDATE_RANDOM;
|
|
||||||
}elseif($lightAbove >= 9){
|
|
||||||
//try grass spread
|
|
||||||
for($i = 0; $i < 4; ++$i){
|
|
||||||
$x = mt_rand($this->x - 1, $this->x + 1);
|
|
||||||
$y = mt_rand($this->y - 3, $this->y + 1);
|
|
||||||
$z = mt_rand($this->z - 1, $this->z + 1);
|
|
||||||
if(
|
|
||||||
$this->level->getBlockIdAt($x, $y, $z) !== Block::DIRT or
|
|
||||||
$this->level->getBlockDataAt($x, $y, $z) === 1 or
|
|
||||||
$this->level->getFullLightAt($x, $y + 1, $z) < 4 or
|
|
||||||
BlockFactory::$lightFilter[$this->level->getBlockIdAt($x, $y + 1, $z)] >= 3
|
|
||||||
){
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($b = $this->level->getBlockAt($x, $y, $z), $this, BlockFactory::get(Block::GRASS)));
|
|
||||||
if(!$ev->isCancelled()){
|
|
||||||
$this->level->setBlock($b, $ev->getNewState(), false, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Level::BLOCK_UPDATE_RANDOM;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onActivate(Item $item, Player $player = null) : bool{
|
public function onActivate(Item $item, Player $player = null) : bool{
|
||||||
@ -108,13 +100,13 @@ class Grass extends Solid{
|
|||||||
TallGrassObject::growGrass($this->getLevel(), $this, new Random(mt_rand()), 8, 2);
|
TallGrassObject::growGrass($this->getLevel(), $this, new Random(mt_rand()), 8, 2);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}elseif($item->isHoe()){
|
}elseif($item instanceof Hoe){
|
||||||
$item->useOn($this);
|
$item->applyDamage(1);
|
||||||
$this->getLevel()->setBlock($this, BlockFactory::get(Block::FARMLAND));
|
$this->getLevel()->setBlock($this, BlockFactory::get(Block::FARMLAND));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}elseif($item->isShovel() and $this->getSide(Vector3::SIDE_UP)->getId() === Block::AIR){
|
}elseif($item instanceof Shovel and $this->getSide(Vector3::SIDE_UP)->getId() === Block::AIR){
|
||||||
$item->useOn($this);
|
$item->applyDamage(1);
|
||||||
$this->getLevel()->setBlock($this, BlockFactory::get(Block::GRASS_PATH));
|
$this->getLevel()->setBlock($this, BlockFactory::get(Block::GRASS_PATH));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -25,8 +25,6 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\ItemFactory;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\math\AxisAlignedBB;
|
use pocketmine\math\AxisAlignedBB;
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
|
|
||||||
@ -43,7 +41,7 @@ class GrassPath extends Transparent{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_SHOVEL;
|
return BlockToolType::TYPE_SHOVEL;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function recalculateBoundingBox() : ?AxisAlignedBB{
|
protected function recalculateBoundingBox() : ?AxisAlignedBB{
|
||||||
@ -61,18 +59,15 @@ class GrassPath extends Transparent{
|
|||||||
return 0.6;
|
return 0.6;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onNearbyBlockChange() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_NORMAL and $this->getSide(Vector3::SIDE_UP)->isSolid()){
|
if($this->getSide(Vector3::SIDE_UP)->isSolid()){
|
||||||
$this->level->setBlock($this, BlockFactory::get(Block::DIRT), true);
|
$this->level->setBlock($this, BlockFactory::get(Block::DIRT), true);
|
||||||
return $type;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [
|
return [
|
||||||
ItemFactory::get(Item::DIRT, 0, 1)
|
ItemFactory::get(Item::DIRT)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,6 @@ namespace pocketmine\block;
|
|||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\ItemFactory;
|
use pocketmine\item\ItemFactory;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class Gravel extends Fallable{
|
class Gravel extends Fallable{
|
||||||
|
|
||||||
@ -44,17 +43,16 @@ class Gravel extends Fallable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_SHOVEL;
|
return BlockToolType::TYPE_SHOVEL;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
if(mt_rand(1, 10) === 1){
|
if(mt_rand(1, 10) === 1){
|
||||||
return [
|
return [
|
||||||
ItemFactory::get(Item::FLINT, 0, 1)
|
ItemFactory::get(Item::FLINT)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
return parent::getDrops($item);
|
return parent::getDropsForCompatibleTool($item);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
@ -23,7 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Tool;
|
use pocketmine\item\TieredTool;
|
||||||
|
|
||||||
class HardenedClay extends Solid{
|
class HardenedClay extends Solid{
|
||||||
|
|
||||||
@ -38,10 +38,14 @@ class HardenedClay extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_WOODEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getHardness() : float{
|
public function getHardness() : float{
|
||||||
return 1.25;
|
return 1.25;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -44,7 +44,7 @@ class HayBale extends Solid{
|
|||||||
return 0.5;
|
return 0.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos, Player $player = null) : bool{
|
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
|
||||||
$this->meta = PillarRotationHelper::getMetaFromFace($this->meta, $face);
|
$this->meta = PillarRotationHelper::getMetaFromFace($this->meta, $face);
|
||||||
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
$this->getLevel()->setBlock($blockReplace, $this, true, true);
|
||||||
|
|
||||||
@ -54,4 +54,12 @@ class HayBale extends Solid{
|
|||||||
public function getVariantBitmask() : int{
|
public function getVariantBitmask() : int{
|
||||||
return 0x03;
|
return 0x03;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public function getFlameEncouragement() : int{
|
||||||
|
return 60;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getFlammability() : int{
|
||||||
|
return 20;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -23,9 +23,8 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
|
use pocketmine\item\enchantment\Enchantment;
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\Item;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
use pocketmine\level\Level;
|
|
||||||
use pocketmine\Player;
|
use pocketmine\Player;
|
||||||
|
|
||||||
class Ice extends Transparent{
|
class Ice extends Transparent{
|
||||||
@ -53,29 +52,27 @@ class Ice extends Transparent{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onBreak(Item $item, Player $player = null) : bool{
|
public function onBreak(Item $item, Player $player = null) : bool{
|
||||||
return $this->getLevel()->setBlock($this, BlockFactory::get(Block::WATER), true);
|
if(!$item->hasEnchantment(Enchantment::SILK_TOUCH)){
|
||||||
|
return $this->getLevel()->setBlock($this, BlockFactory::get(Block::WATER), true);
|
||||||
|
}
|
||||||
|
return parent::onBreak($item, $player);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function ticksRandomly() : bool{
|
public function ticksRandomly() : bool{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onUpdate(int $type){
|
public function onRandomTick() : void{
|
||||||
if($type === Level::BLOCK_UPDATE_RANDOM){
|
if($this->level->getHighestAdjacentBlockLight($this->x, $this->y, $this->z) >= 12){
|
||||||
if($this->level->getHighestAdjacentBlockLight($this->x, $this->y, $this->z) >= 12){
|
$this->level->useBreakOn($this);
|
||||||
$this->level->useBreakOn($this);
|
|
||||||
|
|
||||||
return $type;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDrops(Item $item) : array{
|
public function getDropsForCompatibleTool(Item $item) : array{
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,8 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace pocketmine\block;
|
namespace pocketmine\block;
|
||||||
|
|
||||||
use pocketmine\item\Item;
|
use pocketmine\item\TieredTool;
|
||||||
use pocketmine\item\Tool;
|
|
||||||
|
|
||||||
class Iron extends Solid{
|
class Iron extends Solid{
|
||||||
|
|
||||||
@ -39,18 +38,14 @@ class Iron extends Solid{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getToolType() : int{
|
public function getToolType() : int{
|
||||||
return Tool::TYPE_PICKAXE;
|
return BlockToolType::TYPE_PICKAXE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getToolHarvestLevel() : int{
|
||||||
|
return TieredTool::TIER_STONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getHardness() : float{
|
public function getHardness() : float{
|
||||||
return 5;
|
return 5;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public function getDrops(Item $item) : array{
|
|
||||||
if($item->isPickaxe() >= Tool::TIER_STONE){
|
|
||||||
return parent::getDrops($item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user