Commit Graph
1357 Commits
Author SHA1 Message Date
Ghost_chu fb8cbd569e Paste more datas when pasteing.
Need upload transaltions cause it may cause no-reasion disconnect if somethings wrong in there.


Former-commit-id: 1ccaff5e248962e83d09c389cd83be8183086f60 [formerly 4c77998bb57eaaf35dd92ee4ab4a08e3a93a7153]
Former-commit-id: 9c9064cdbd82f8171f4cd134be9320e9060f9f82
2019-08-19 15:32:54 +08:00
Ghost_chu 3c0f6cb322 Add lines between debug logs
Former-commit-id: a86a8e2d8dabcc7e5e773a79afb30bf2e0864194 [formerly 5435c54d346b9c0f3d4a63379670d19cff8888e8]
Former-commit-id: 60f81ce88c80d9c13705aaaa49406a4784a12cd6
2019-08-19 15:29:47 +08:00
Ghost_chu 11746edff8 More friendly to send BUILD CHECK failed message
Former-commit-id: f1c743862aefd34adbffb6a44834a52c29aac7d2 [formerly 5de39333b755e043b287dffd68ecc036f00c4d43]
Former-commit-id: 0224ef779b0704255d23894d58edfb8793e82692
2019-08-19 15:28:28 +08:00
Ghost_chu 6e7c2293fa Fix itemMatcher and sell command bug
Former-commit-id: 15cdc3fbdcff754a0205c8afc20877fc9a9d8be9 [formerly 65add46848be7e2af0b15dac57791f8c89bcaacc]
Former-commit-id: 094f82c7dff166e4bbaad446ccfd7470eebb2737
2019-08-19 15:27:07 +08:00
Ghost_chu 1cdb34bec5 Fix meta matcher class in the matcher class
Former-commit-id: 3e7f2f90a576fbc0c37056298f8d939bbad1d16e [formerly f0ee1ce46f6125f4b4f8866b39031cc2b1abdbc1]
Former-commit-id: 01ebe770e0b638c381156310633a6620bb65e077
2019-08-19 15:21:10 +08:00
Ghost_chu 16d2903df4 Use faster deepEquals method in java to replace lines check
Former-commit-id: 474b213f30199e50b9863bc2c11b5a0470dae65b [formerly 1992fa33889457e7c7930ff4e09867d40c8cda0f]
Former-commit-id: 558c3e2d43f87467ba4ca6a14048c5044aadc374
2019-08-19 15:20:06 +08:00
Ghost_chu 792fd82d1e Use faster deepEquals method in java to replace lines check
Former-commit-id: cec29e4517b627ca50c4e37bd06636acc34b4aaf [formerly 2261ef58b73b1bc28d8d2581869a81e728ee3699]
Former-commit-id: 7241fc0086cb3804a684f401d01c2648f97bc358
2019-08-19 15:18:20 +08:00
Ghost_chu d808b9c0c9 Add repaitcost support
Former-commit-id: f025824f0117363c7ebacb2811677ddcc16d61a4 [formerly 286df6551ab76130ff3b7ffdff3b2faf577ec797]
Former-commit-id: d975c63051915d7a952f01afa8fa1cab78a94362
2019-08-19 15:12:18 +08:00
Ghost_chu b349d9ce02 Fix ItemMatcher bugs.
Former-commit-id: 2418c4bd624f19745fb79df926a1c8974e28476a [formerly d9c0aed489021dad7d8e5683894bd58bb2934347]
Former-commit-id: 93107c54fecb77bc8b3cdff9f3da04cbfa056b04
2019-08-19 15:00:54 +08:00
Ghost_chu 227d1c0382 Remove useless comments, we already will save example config in data folder
Former-commit-id: 296099b2f5394eab1d63932f739f4b890f106849 [formerly 90a6c070ae16d27ac77d6735cf71d88b945f337e]
Former-commit-id: a3b076c41338dffc38745e86bb2b2e5af08d1f87
2019-08-18 23:07:35 +08:00
Ghost_chu df87ec2993 Fix build error
Former-commit-id: bfad8d848420180cb89592a3d6ecd954a05e105e [formerly 44121054a9e2b54aa8fd90ea09a3c37461d5b357]
Former-commit-id: 36563bf0bbe7369ca290ccd7e4c5a04eb2caae06
2019-08-18 23:01:09 +08:00
Ghost_chu acbb65a7dc LangUtils language auto-load
Former-commit-id: c16b85b110e325a252545c6eb3bc696d40d94d6b [formerly a0ce3186f16df210ad39e4d0c6c25facb1b9889a]
Former-commit-id: 7bf49366b1d5b9ec73f9bf34b82e25df224c9176
2019-08-18 22:59:54 +08:00
Ghost_chu ce532f73d0 Old(KaiNoMood) QuickShop detect.
Former-commit-id: f172f7adec69e92d2de11c1f8a70e35302d85c16 [formerly 9db5fbd5f0a7786383bf551c34216c91acf93e39]
Former-commit-id: 178904a3a6d4e75a01189f83ded0133ed2846470
2019-08-18 22:51:24 +08:00
Ghost_chu 8d8f93683b Fix sentry errors
Former-commit-id: b0b20ceb0ba7d8698a68cba1bdbac38081fe0257 [formerly d16a14d14ff9315d28dcfab3158b7c9ea39d98b7]
Former-commit-id: 858df03a408e093454c51b4af40febed2b470bb0
2019-08-18 22:47:49 +08:00
Ghost_chu b3b1c6225a Null economy system detect
Former-commit-id: 6f0f5e85662475cd5dcade7c74c55e688be3be6f [formerly e452e99b3c16026056453a95a9ca4cebceb33500]
Former-commit-id: a7773a1a9bb8a9398a9341b6ddd847c86bd3a4df
2019-08-18 22:40:09 +08:00
Ghost_chu 8de5b5d02c Patch stupid space in chat
Former-commit-id: a47c4d08f052c38f730b4f579405601c462edf6b [formerly bea7b865d3e3ceeedef4ec77200e7d7ace9ceaee]
Former-commit-id: d1151386c8bd00ca4ee511e189dfcf052412411e
2019-08-18 22:33:57 +08:00
Ghost_chu 86b7cc7064 Rewritten the ItemMatcher
Former-commit-id: 4213ae2f22583eb16bf74914ca0e82e95fb24b4f [formerly 77667dedda07394085e1d0fbcc9937bcade02220]
Former-commit-id: 65b76392b994d0caf1c6b5219b4906d3be0c4011
2019-08-18 22:30:59 +08:00
Ghost_chu 0fb20f89f2 Add the ShopProtectionCheckEvent for calling protection check event.
Former-commit-id: ea18ee45b91891acf6209a49adf6721884735d78 [formerly c0b8a34e23ad7b4668966d6f681b881b10f98a80]
Former-commit-id: 5a519d862f0e81ccede9dd6b7f72d6fd69f12d05
2019-08-18 22:08:40 +08:00
Ghost_chu ee9e8569d6 Fix support for double-chest protection.
Former-commit-id: 31c2f05c56cb4ede8a37b71c7ecfa75a8741539f [formerly 87cce965edd35c686d0e2c249f91fa0e55285a36]
Former-commit-id: 2a74ad7b3413014f31ecb705a57ca83f6a671a2b
2019-08-18 21:54:42 +08:00
Ghost_chu 90f02a8a2e Fix build error
Former-commit-id: c2fa1ad0e069d19b0a28a0417898016a53682df3 [formerly 6c2cd7e67cdf99bd86cd170c04aa4d6876f6df80]
Former-commit-id: b53952fb6020402f5d29f1edaba91d45c98fe330
2019-08-17 19:57:55 +08:00
Ghost_chu 83da71a4fe Bump config updater
Former-commit-id: 1778a757285395ba934dee8b6ab19e1997b020cb [formerly c5cbddfc3949c31188b829c09c171a92b7b48d6e]
Former-commit-id: df234863444b08773bd3cbd03403a67c36820c98
2019-08-16 21:34:02 +08:00
Ghost_chu 22eec43020 Change hard code to fork name
Former-commit-id: ae4d436cb3092270fcd92cc1f5f077219f9499e1 [formerly 442c6c2a2aa312d5ac350f19f4e0d971dcc8b210]
Former-commit-id: 828b5c57c536a9ca9c8395d825b677e37107ab72
2019-08-16 21:33:15 +08:00
Ghost_chu 77ab87b626 New permission provider system
Former-commit-id: 1fa06035b2c0976be54c3554f0b2ae17fb2df1a1 [formerly d1f9ff9bf57e4b308aab1f6f8ac06a91140fc7b2]
Former-commit-id: 848f3e2b613736d836264b7d055195d78ab64d58
2019-08-16 21:30:49 +08:00
Ghost_chu e883e0b44f Tweak codes
Former-commit-id: 3b248850f8c5ada53752db6afca742800a978232 [formerly 562cd833976132d4a52432a967a430091bde3c2e]
Former-commit-id: 99642d75d663f514643b45620f97aaba5a5fad32
2019-08-16 18:39:00 +08:00
Ghost_chu 31bb613ba3 update the pom
Former-commit-id: e5c9ac599b9dbe688a0ecb989859791a13b2c896 [formerly 2642fb5e9431825676d7c38d0877ac0287424258]
Former-commit-id: 6043af992ccec046e34c25fe5d097571c5a616af
2019-08-16 18:11:12 +08:00
Ghost_chu a55da70494 Merge pull request #165 from ibmibmibm/master
Fix tax calculation on buying shop

Former-commit-id: a510a51c51771cbd02d8ef12a4984ea745293d8e [formerly bf3a8d862e6328a7b2a16e5f38455dbb7029bef9]
Former-commit-id: 97ee8ce02a5f1f932c256fa4cf4235cadc2d737a
2019-08-14 23:16:22 +08:00
Shen-Ta Hsieh 310de8c571 Fix tax calculation on buying shop
Former-commit-id: 30824cc1baf23d2d41ad815f2a5515765d504742 [formerly 7b6693135c28803f6d4e93e8290e809f448db343]
Former-commit-id: 11b0078c47d99a117f2b1b482ae5f35cfa021bd8
2019-08-14 20:24:50 +08:00
Ghost_chu 65308a0f31 Fix typo
Former-commit-id: 70c16f635844c1603843cdb998a53b85ad1542aa [formerly c9aad2f491cfa1fece3a90b84a5d559f4fdd857a]
Former-commit-id: 498345f853065be9f067cfe81f9c02359935d477
2019-08-13 20:30:08 +08:00
Ghost_chu ac36014117 Bump 2.3.8
Former-commit-id: 7dbba2eaca8c516a60557397bd6a0ee15700291f [formerly a570f059c8e643febf3ca5c355d684695ab893c4]
Former-commit-id: b5e92419f4b19d2ff6f85083f48d92603aa50ff0
2019-08-13 20:28:52 +08:00
Ghost_chu b9a1e2b19e Example config file and LangUtils support
Former-commit-id: 34cba154d0104e669d29fdf8ad65b6fa98aaad80 [formerly e223f40f724cecc499e9ef03b58a985d5f61d323]
Former-commit-id: 9a3aa901b3253f72daf3fc0825b4f240282b6c11
2019-08-13 20:27:25 +08:00
Ghost_chu fc84d9bce3 2.3.7 bump
Former-commit-id: 821011415e3e591b7dc423cccc343cb65f8026cb [formerly 0f20bac53ad6c999090ac407875aa6d6d983141e]
Former-commit-id: 1d20a8cabbe1cc21cde8581925666cd7f8378105
2019-08-13 19:28:21 +08:00
Ghost_chu bba5ed4deb Lombok, u r bad!
Former-commit-id: 824a58f9e76d2a3d381fb7b3ec27d34d1eb0799a [formerly 95df98f1ccea029108d8623d91eb9d33407b0369]
Former-commit-id: 4e8042358a4b2c564bf7694eaaec10d9a459b04a
2019-08-13 19:23:25 +08:00
Ghost_chu 65446c18ed Add NoCheatPlus support
Former-commit-id: 93d9a079f7c5ee4f9af4790583ec2dc5884b8e46 [formerly 570b75dfce5e28c4a3bdeafa20db1009105e3c7d]
Former-commit-id: 0f6fae5f21750e4a673dcb1df8c69d6ae7deed42
2019-08-13 19:09:40 +08:00
Ghost_chu 86598cf9f0 Deprecated the copyTo method
Former-commit-id: 7bb676aab7b6d5729bbe6a7362094601248acc51 [formerly d147d1bbac3e7fe91efe9e72909bc212be14e1eb]
Former-commit-id: 183d7fbd3b25e80efcc485e4cb57c5d987807d30
2019-08-13 17:12:00 +08:00
Ghost_chu 8268577e8b Save changes into database when shop is unloading
Former-commit-id: 2d867c55cb0966a1ce2fa573d18b9a66581edf81 [formerly 568feb1452bd7a465c4adcb16d566ba9037426ea]
Former-commit-id: bbbac7b47dfa65b9b7bc4d3e046a340f060d7333
2019-08-13 17:09:50 +08:00
Ghost_chu 252a0ad64a Add ShopClickEvent
Former-commit-id: 6486e73df12221875b9e4d3d300f830bdedc87bc [formerly 6620b335d1fdeaa1fc60dfcfabfb9aef9b415842]
Former-commit-id: af2c95491abdb2adaf321d7f6331830ef804f995
2019-08-13 17:08:38 +08:00
Ghost_chu a83b5da23c If no number input, output errors to debug log
Former-commit-id: 9ea5a32c3970a2b37b4a1b97de8185ea694570fe [formerly 7ef977b5b021bfbdfed87631b2e481ffa8262d49]
Former-commit-id: dc872789da9da8f4e72b3770d5d9f0f10e5b5b75
2019-08-13 17:00:48 +08:00
Ghost_chu 916c32528b Fix possible NPE when tax is empty
Former-commit-id: 00ddb76f97f005642da47b81c3d5362823af3b2c [formerly 968cd2b7e6ad090dc0dc14bd2f81decac6880edc]
Former-commit-id: 63821c1e4edee61ac7ae2ded026a9052784df886
2019-08-13 16:57:02 +08:00
Ghost_chu 80318c4bd7 Optimize the code
Former-commit-id: 3d0cc60d113637ee32c542d8ed18e487518a8aca [formerly b783eed1dbb7c29817b5c1d4835a3b009cd648cf]
Former-commit-id: 9bb8deca0ffdc07d274b90308fd4c811fa4cd20b
2019-08-13 16:52:06 +08:00
Ghost_chu eabb883810 Detect the AIR itemstack shop.
Former-commit-id: cc03daa513c7e9b00c9a2bdc73d45b848555d770 [formerly 35af43e79c2954a5b1d4bafa0ffba5485a3a253a]
Former-commit-id: 7c2b5211b704959c164cefe9b0b44eb6f675b33f
2019-08-13 16:50:40 +08:00
Ghost_chu 3d88c4f349 Detect more broken shop infomation in database
Former-commit-id: 87d7fe1bf933c5ede0880682eed767becea0bd3f [formerly 0932f356edeb77fc116f4b6136788c8289376aed]
Former-commit-id: eb02caf088d20f0142ab250fca89f1d724f333be
2019-08-13 16:48:55 +08:00
Ghost_chu 48d2ccb547 bump 2.3.6
Former-commit-id: b5d509850f22ee8ea380b25625679dd4bf432c8b [formerly e14d88569f78bfd4e6ec2105ea2ec433f110d9b0]
Former-commit-id: ca18ecfacb69882a1d3a6c583a37b463a7e54235
2019-08-13 16:45:55 +08:00
Ghost_chu d98ffe7416 Skip the shaded jar, only use normal one.
Former-commit-id: 923bc31ae7ed516a839e0c3fcb632b7ec301f4ab [formerly 0b0f14d86ce8bb70cb60658f177b092e4ed8f926]
Former-commit-id: d6a429c71ef671f1ac9fdb805547077705297e1f
2019-08-13 16:45:35 +08:00
Ghost_chu 77c51b581a Fix ConcurrentModificationException in ShopManager$ShopIterator
Former-commit-id: bcabc941751027c1fa1739f7b40aad8402511ca9 [formerly 06bfcbe24aae770dab485d21444dc9ab55797394]
Former-commit-id: ae240f53d9aa95706127492d6d710a227353af9e
2019-08-13 16:41:18 +08:00
Ghost_chu 77a3f125a0 Move container checks to standalone method, so other plugin can use it.
Former-commit-id: 4ccb9867f15c20b51d12eed5bd5b000dcfb2e8b4 [formerly 7fb42701e4a8c245ca86b4d1769edfe877dfd19f]
Former-commit-id: 526dd140f7ec15f997dfbd1e4d7294fad43e176e
2019-08-13 16:36:21 +08:00
Ghost_chu bc0838d3ea We need told user if sentry unloaded, not simple a disabled alert.
Former-commit-id: 629e730beee76fc4f236c909f2bd90cd4bf99cae [formerly fc7e78c5f03fb8e7fbc12d6ca7092118423b6664]
Former-commit-id: f566ede0628bd20d339fa40371dacd00afb01481
2019-08-13 16:33:47 +08:00
Ghost_chu 0f25b473cb No more stupid
Former-commit-id: da86a813fb1b175642aa1a0811606b2ad02c6a25 [formerly 38454fa78ad00774d324c3e0bbcb6638e13eca7f]
Former-commit-id: 2ace12a3bbb88e59fa351088f4e7174cea704dbf
2019-08-13 16:31:23 +08:00
Ghost_chu 63c48dd53c Fix possible NPE error
Former-commit-id: e80d18b489fa982d16ddef89d3205fcef985e8e6 [formerly 7be34d6c9173151e6d86c4a1032907c593376f29]
Former-commit-id: 983cdaf75ab114814d7f60228f338561d9cf0ed2
2019-08-13 16:24:28 +08:00
Ghost_chu 044aaac665 Unload all shops when server shutting down
Former-commit-id: 96a54564cff4c48068ef7b2c1be4e7111d3621c5 [formerly 39470a2e4b50b10bb029c1bb27a70f4320c420b4]
Former-commit-id: 1c3bcbde49c6ed245072e5e645e01544745141d7
2019-08-13 16:23:50 +08:00
Ghost_chu bea49d773b Add loaded shops api
Former-commit-id: 74bc27698e5f8f1a5d8c8b38fa58b27932119b91 [formerly c71ea19e99cef09a967aaa07b9dba38955e05015]
Former-commit-id: 4b62dbd00a6e319d654c8bde9ec6492998450fab
2019-08-13 16:23:02 +08:00