Commit Graph
4369 Commits
Author SHA1 Message Date
sandtechnology e595847b0f Delete caching i18n file to let them regenerate
Former-commit-id: 53ec63624a9ed7623f1700dde1cd58d6d633a356
2020-11-29 20:43:51 +08:00
sandtechnology b695bb9e9a Fix WorldGuardIntegration load twice problem
Former-commit-id: bfe4422a6e565262f6e5ec9f759a21da55ff4f35
2020-11-29 20:40:18 +08:00
sandtechnology e9850cdb57 Revert "Support replace language file when switch to other language"
This reverts commit 420b33d3


Former-commit-id: 3f322238b105ad2d8d999b188afe763be05d0788
2020-11-29 20:30:48 +08:00
sandtechnology 089be5cb62 Support replace language file when switch to other language
Former-commit-id: 420b33d314d42a73c251d647d007d0be853c4c9a
2020-11-29 20:28:21 +08:00
sandtechnology 031acae774 Notify user when registering/unregistering module/integration
Former-commit-id: 51fdcbc6cc46717dd598ac5aefddc54aefa2d897
2020-11-29 20:14:06 +08:00
sandtechnology 63bcdb52da Fix CME when unloading
Former-commit-id: 5d78023457a28b1f676a65152373664b3fd2e796
2020-11-29 20:06:02 +08:00
sandtechnology a27d8054b2 Fix wrong message in find command
Former-commit-id: b71479884d5d5da8f62ba9995c456d34de00c7f9
2020-11-29 20:05:45 +08:00
sandtechnology f2edac48f4 Fix the PriceLimiter bug (detecting stacking shop)
Former-commit-id: e9e2cc5a3bf799bb26a9e0173a2d77e5b2f792c7
2020-11-29 18:56:32 +08:00
sandtechnology f868117d6a Fix item price limit bug
Former-commit-id: cf733df2358c2474789cef5d49729b48a203a289
2020-11-29 18:54:12 +08:00
sandtechnology 253e011553 Handle null integer value
Former-commit-id: 60819716fa44278410113d9bf5660113e09ca784
2020-11-29 12:55:36 +08:00
sandtechnology 031db4c5fb Merge remote-tracking branch 'origin/master'
Former-commit-id: dc9c94a52d5ad582e8758b20906b2969f49aa230
2020-11-26 18:48:04 +08:00
sandtechnology 69d902db83 Fix shop finding bug and add a way to restore old finding logic
Former-commit-id: 4e572862ec4655dbb7860ce65b0dbf6fe77139ad
2020-11-26 18:47:38 +08:00
Ghost_chu dc1e8f9233 Some stupid things about modded server platform
Former-commit-id: 64d566f299a4c85437b8fde1c044917d371fff1c
2020-11-25 00:24:55 +08:00
Ghost_chu ead7f48c59 Create ShopTypeChangeEvent, Close #716
Former-commit-id: dbb987c231d0494bf5dbc1505ad2feeb44984646
2020-11-24 20:41:17 +08:00
Ghost_chu 57b58c4f99 New translations messages.json (French)
Former-commit-id: bd874ab53635a01f846ae51c4fcee401f5da4778
2020-11-24 16:00:31 +08:00
Ghost_chu 4723f38e83 New translations messages.json (French)
Former-commit-id: dfef1f22fc458def61c68189c5b252a01c0784bd
2020-11-24 15:38:04 +08:00
sandtechnology 0bc69d2318 Add missed listener registering
Former-commit-id: 634f7dd762d506eba504dd2a1b9e0f4e32000116
2020-11-22 11:04:07 +08:00
sandtechnology 14d04347d2 #653 Support hot loading
Former-commit-id: b745c73ac06ddac8bdfbedb7c2ebdcfd5511e7ee
2020-11-22 11:01:20 +08:00
sandtechnology 8bacfc8e8a Fire ShopSignUpdateEvent in the right position
Former-commit-id: 5c552f4ff8e8ae8f96a1b15cc8b7270176b4d7b2
2020-11-22 10:32:19 +08:00
sandtechnology bc31949cc9 final the prices
Former-commit-id: 393c89fdc163eb0f75742e1052935489d4d7a802
2020-11-22 10:30:46 +08:00
sandtechnology 68800c5202 Add new ShopItemChangeEvent
Former-commit-id: 5bfaab09224d452cd7a8f95a0290f9b9720c28cf
2020-11-22 10:29:02 +08:00
sandtechnology 5bda2e6ab6 Fix wrong javadoc in event and add missing event calling, fix #655
Former-commit-id: f03181525ca1a72a89d156ff79f366a71bd6750b
2020-11-22 10:22:04 +08:00
sandtechnology e95429b6cc Correct type parameter
Former-commit-id: fb912c0ebe0de2cb42169bc9bf678009106808ae
2020-11-22 01:13:45 +08:00
sandtechnology 799515c69a Change structure for friendly API
Former-commit-id: 590a160b2b0c68b5efad93be94aac77834907c2f
2020-11-22 01:11:05 +08:00
sandtechnology ff3085f469 Refactor Compatibility, prepare for hot loading feature
Former-commit-id: b06a3efc0adf5f23b86081b57784fc7b1ca03939
2020-11-22 00:59:01 +08:00
sandtechnology 9c1922c27d Refactor Integration, prepare for hot loading feature
Former-commit-id: 2ee199100447b6299a1a95fea53298ac0a503e06
2020-11-22 00:24:49 +08:00
sandtechnology d58d4c1c9f Caching api instance
Former-commit-id: 1553a3a41f07a688f8979e5fb4323d769ee9c317
2020-11-22 00:19:53 +08:00
sandtechnology de2beb5fb9 add warning for releasing connection
Former-commit-id: 5cd3c0ab3e2fff7e1eda6c23dcf87db028b355e4
2020-11-20 17:31:05 +08:00
sandtechnology e9a629c40a Fix another deadlock.......
Former-commit-id: 80a454406defb596a3b3d9f426facade4cbbd6dc
2020-11-20 13:46:56 +08:00
sandtechnology 68d23987d2 Fix another deadlock
Former-commit-id: cde7347c4547fe7c1f902f937bdc0653b6383758
2020-11-20 13:20:03 +08:00
sandtechnology 98b37c6e0f Fix another deadlock
Former-commit-id: cd106a88314dbb46d7c4a7e9d597cd8c67fb59e7
2020-11-20 13:18:00 +08:00
sandtechnology 08169fd3ed Add missing logic
Former-commit-id: be1168cc519f06bf856d795a8333bd345c430b4e
2020-11-20 12:46:19 +08:00
sandtechnology 93b0e1bad6 Try to fix #650 again, redesign connection occupied logic.
Former-commit-id: 8f67c7bc672ed0bde0f67f9d2e5ce614ddaa913a
2020-11-20 12:41:37 +08:00
sandtechnology 16d1cebb06 Try to fix #650, synchronized for database connection
Former-commit-id: 07fad3a227b9e5f4e704671b3c7559921b9e01e5
2020-11-20 12:25:02 +08:00
sandtechnology 549177f440 Add unit test for InteractUtil
Former-commit-id: fac61000e38bc0f55fa9524f40d4e849e22d161e
2020-11-19 19:16:52 +08:00
sandtechnology 6a043469a1 Fix interacting bug (thanks to @mantraop on discord)
Former-commit-id: 51251f50642296e483381883986f5e9e59b6a9d1
2020-11-19 18:40:56 +08:00
sandtechnology 7402770248 Temporary fix NoClassDefFoundError when init sentryErrorReporter
Former-commit-id: ed4ef5895382bba8c1950a3e25ce7f35547143d3
2020-11-19 17:48:33 +08:00
sandtechnology e15a6c5e7c Private modifier
Former-commit-id: 07ac0a2f3870647ddf1c9930fbd025ca912cbbb2
2020-11-17 11:50:28 +08:00
sandtechnology 8e6839d6cf Merge pull request #643 from Ghost-chu/l10n_master
New Crowdin updates

Former-commit-id: fea20d89abe2435c5de8850aecfa7fe70ac2292c
2020-11-17 11:44:39 +08:00
sandtechnology 7431424403 Fix bug in find command, thanks to @kenanbit
Former-commit-id: c8c75f5a68e7121bfc8a30988ab5c41496f9aa7c
2020-11-17 11:41:56 +08:00
sandtechnology f0466bf443 Fix sign recognize issue and build error
Former-commit-id: c79f4adacf4681964ef53d1a235a1312f630f007
2020-11-17 11:23:42 +08:00
sandtechnology 1a0f2773c4 Putting convert progress to an async task to prevent watchdog issue.
Former-commit-id: e8d6779be294f98a2831002ce21b2ccef975c21c
2020-11-14 23:11:01 +08:00
Ghost_chu 4c0a504bd7 New translations messages.json (Chinese Traditional)
Former-commit-id: a59a3117436d708ece95a696ec3f11f87d9150c2
2020-11-14 17:15:23 +08:00
sandtechnology 241b4eab74 Implement #642
Former-commit-id: d3f5e000f3eece3ca03e0bc59f1e71e8e15995d2
2020-11-14 09:57:21 +08:00
sandtechnology f3ebced4cd Apply IDE suggestions
Former-commit-id: eaecea5ac17917f4e10d22a8bba1640338e67ac4
2020-11-13 15:00:25 +08:00
sandtechnology 020ef861d1 Using try-with-resources
Former-commit-id: 00f991b6a6eb470fec57bcf3304f5cf468be88db
2020-11-13 14:48:22 +08:00
sandtechnology d0add54eae Always waiting connection
Former-commit-id: fd38faf6e3b52a6363f1a83f079c02025739d1e7
2020-11-13 14:37:31 +08:00
sandtechnology 11351d17d8 Logging in debug log
Former-commit-id: a0d69d1a81f9b0986b51f3457894be2b14693dfb
2020-11-13 14:29:13 +08:00
sandtechnology 8c552db573 Fix interrupt
Former-commit-id: 8b4422eb421b935fa09c8ed358425c926b8f0f83
2020-11-13 14:27:01 +08:00
sandtechnology 78a0587c49 Use java.util.ArrayList instead of java.util.LinkedList
Former-commit-id: 9d16ee1389704adab81b6eda4e14c98e4402b18b
2020-11-13 14:21:59 +08:00