Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
488 Commits 1 Branch 0 Tags 11 MiB
47b2eeccb4
Commit Graph

365 Commits

Author SHA1 Message Date
Olof Larsson
f4b3924dc3 We wanna serialize JsonElements as JsonElements, duh 2013-09-10 02:40:57 +02:00
Olof Larsson
5782eb9193 For those that felt like clearing their config file. 2013-09-09 19:57:04 +02:00
Olof Larsson
0c8f1c9cf1 Check if AsyncPlayerChatEvent is async or not. Fixes #35. 2013-09-08 22:59:40 +02:00
Olof Larsson
ae575ac674 Merge branch 'master' of github.com:MassiveCraft/mcore 2013-09-06 11:35:28 +02:00
Olof Larsson
ac3ff4590e Make recipient event work for console. Add in some more debug in mstore. 2013-09-06 11:35:07 +02:00
riking
fe6ce01037 Define hashCode() for TimeUnit as it is being used in a HashMap 
TimeUnit is being used as the key to a map in TimeDiffUtil, so we must define a hashCode() consistent with its equals() method.

The implementation is the same as java.lang.Long.hashCode().
 2013-08-30 18:45:57 -07:00
riking
5c6cd57a4d Use a MutableBoolean to synchronize on instead of a Boolean 
The code synchronizes on a boxed primitive constant, such as an Boolean.

Since there normally exist only two Boolean objects, this code could be synchronizing on the same object as other, unrelated code, leading to unresponsiveness and possible deadlock.

This commit uses the MutableBoolean class from commons-lang, which is included in bukkit.jar.
 2013-08-30 18:40:48 -07:00
Olof Larsson
f78872c157 Oh yeah. I should not use ServerConf since this could be MConf. 2013-08-29 10:55:35 +02:00
Olof Larsson
6810d92b68 Say what entity load failed and why in a nicer manner. 2013-08-29 08:37:31 +02:00
Olof Larsson
5a2ef78d58 Forgot to clear at setup. 2013-08-27 10:58:18 +02:00
Olof Larsson
296d0cbdb2 Add in a system to detect if a PlayerDeathEvent is an invalid duplicate event. 2013-08-27 10:56:11 +02:00
Olof Larsson
d21858d5c7 Actually that PlayerConnection wrap was to dangerous. Let's do it simpler and slightly uglier. 2013-08-26 10:29:58 +02:00
Olof Larsson
1b8ae6cf5f Make the forceOnePlayerNameCase much quicker and isolate it in an Engine class. 2013-08-25 12:28:20 +02:00
Olof Larsson
7f7f5db99d Remove old stuff in player util that nowadays we use Mixin for. 2013-08-25 11:41:49 +02:00
Olof Larsson
d9d9b926c1 Force one player name case. Prevents bugs with offline mode servers and case sensitive file systems. 2013-08-23 10:05:41 +02:00
Olof Larsson
443c800a90 Fix indent 2013-08-22 13:53:19 +02:00
Olof Larsson
8b7b19fada Adding in our own per recipent chat event through PlayerConnection wrapping. 2013-08-22 13:36:37 +02:00
Olof Larsson
0fd2fc5bf5 More sound stuff and a hearsound command available to everyone. 2013-08-18 13:13:00 +02:00
Olof Larsson
b679c94892 An ArgReader for Bukkit Sound. 2013-08-18 12:41:21 +02:00
Olof Larsson
0dbe943cfe Make this possible NPE more clear. 2013-08-09 08:35:28 +02:00
Olof Larsson
d4317583b6 Avoid Bukkit error with water potions. 2013-08-07 08:03:08 +02:00
Olof Larsson
0d5fb204a6 Add ability to require a presence in the mixin for commands. 2013-08-06 15:11:20 +02:00
Olof Larsson
ae2c1285d6 Static plz 2013-08-05 13:33:09 +02:00
Olof Larsson
f0dfc539ba CommandMixin plz 2013-08-05 13:30:32 +02:00
Olof Larsson
62b0e8f8b3 Improve upon the teleport mixin again. Lazy destination plz :) 2013-08-05 09:02:42 +02:00
Olof Larsson
e2e8a80de4 Add another constructor variant to VersionCommand. 2013-08-03 12:51:48 +02:00
Olof Larsson
f92f48cbd0 Workaround BUKKIT-4612 2013-07-27 10:07:56 +02:00
Olof Larsson
fa59f9f6cd Check the file ending. Fixes #11. 2013-07-27 09:44:08 +02:00
Olof Larsson
2f75fbdb1d Load permissionToTpdelay. Fixes #22. 2013-07-27 09:36:13 +02:00
Olof Larsson
db74b467b5 Made the permissionDeniedFormats lookups recursive. 2013-07-23 17:42:27 +02:00
Olof Larsson
fb03dae04c This is 6.4.4_dev for 1.6.2 2013-07-11 20:59:26 +02:00
Olof Larsson
a8bb0ed439 Rename back 2013-07-03 09:22:02 +02:00
Olof Larsson
0d38264cb0 Rename to temp, windows is wierd 2013-07-03 09:21:36 +02:00
Olof Larsson
504b479d31 Fix the protocol lib integration. Thanks @aadnk 2013-07-02 21:37:13 +02:00
Olof Larsson
c7d42419e0 This is 6.5.0_dev 2013-07-02 10:28:00 +02:00
Olof Larsson
94d2c1d46d Some users want to set the delay to 0? 2013-06-29 20:07:31 +02:00
Olof Larsson
b0f9eee41d Improve upperCaseFirst stability. 2013-06-28 07:31:15 +02:00
Olof Larsson
7ec866f458 This is 6.4.1_dev, Fix Vault NPE. 2013-06-23 09:27:36 +02:00
Olof Larsson
dc3cb5e1d1 Add destination desc to the event and rename parameters for PS teleport mixin. 2013-06-12 08:44:41 +02:00
Olof Larsson
b4095ed4ab Add a couple of Reqs I found useful. 2013-06-11 17:15:14 +02:00
Olof Larsson
7de7d30e28 Avoid method name clash 2013-06-11 09:13:30 +02:00
Olof Larsson
226fcfe32f Simplified the visibility mixin for now. 2013-06-11 07:21:11 +02:00
Olof Larsson
746ce7fb55 Add in a small async web util. 2013-06-07 09:31:14 +02:00
Olof Larsson
28f96fcab0 Add in pre/post detach/attach hooks and ensure entity contains all data before attachin on first load from remote. 2013-05-31 11:34:23 +02:00
Olof Larsson
cc75cb8e15 Eject passengers and unmount before teleporting. Wont work otherwise. 2013-05-29 14:44:12 +02:00
Olof Larsson
6d57d6f51c Implemented a recursive equality checker for JsonElement. Compensates for MongoDB rounding issues, non deterministic map entry order etc. Also reduces CPU load with 30-40%. 2013-05-27 12:27:45 +02:00
Olof Larsson
b50c8cd048 I like this order better. 2013-05-27 09:46:08 +02:00
Olof Larsson
9d01aa974e Even better statistics. 2013-05-27 09:39:53 +02:00
Olof Larsson
1b7a6c45e6 Adding in a sync-log. This makes it easier to find colls that sync to much 2013-05-27 08:41:06 +02:00
Olof Larsson
2c8c0b7c7d This more flexible. 2013-05-26 17:45:23 +02:00
Olof Larsson
9b0e112a5c Check if entity is FireWork. Fixes #5 and #6. Thanks aadnk. 2013-05-26 11:22:29 +02:00
Olof Larsson
957ef2688e Update for 1_5_R3, after a detailed lookthrough it seems no nms method signatures I used had changed. 2013-05-03 09:57:26 +02:00
Olof Larsson
b846250944 Added missing line, the DB cache now works. Added mstore stats and listcolls command. 2013-05-01 19:41:36 +02:00
Olof Larsson
9a8a792315 Remove _id field in the converter and care about if numbers are floating or not. 2013-05-01 18:59:05 +02:00
Olof Larsson
eb3fc18f65 Save/Update like this? 2013-05-01 18:26:50 +02:00
Olof Larsson
5faf1a885e Renaming the gson driver to flatfile. 2013-05-01 18:13:29 +02:00
Olof Larsson
5e326ed672 Escaping dot and dollar signs in the mongo <--> gson converter, adding success message to copy command and preparing to rename gson --> flatfile. 2013-05-01 18:04:59 +02:00
Olof Larsson
4d6c73f1d6 Working some more on mongo-stuff 2013-05-01 14:48:24 +02:00
Olof Larsson
81be88fca8 The copy command seem to work like this. 2013-05-01 14:29:40 +02:00
Olof Larsson
00304be8a2 Remove stuff I never use and make the database system GSON centric. 2013-05-01 14:06:47 +02:00
Olof Larsson
f6206d0392 Add an mstore command with a todo dbcopy command. Also cache database instances in mstore. 2013-05-01 13:07:21 +02:00
Olof Larsson
b64e8a8b77 Reorganizing MCore internal commands and permissions. 2013-05-01 12:29:51 +02:00
Olof Larsson
a3d99f627f Dies one is command as well 2013-05-01 11:33:11 +02:00
Olof Larsson
35dfb769d5 Move the commands to a special package. 2013-05-01 11:31:00 +02:00
Olof Larsson
9264911634 Rename Perm --> MCorePerm to reduce ammount of class name clashes. 2013-05-01 11:28:15 +02:00
Olof Larsson
738d1f7822 Move the Aspect and Multiverse entities to the main package. 2013-05-01 11:25:39 +02:00
Olof Larsson
41e581ee71 Update MongoDB Java driver to 2.11.1 2013-05-01 11:06:39 +02:00
Olof Larsson
bc92d94f89 Use the bukkit rounding tools to round the same way always. 2013-04-29 12:48:41 +02:00
Olof Larsson
5649117b1f Fix an NPE 2013-04-29 10:35:49 +02:00
Olof Larsson
c34c2354bd Adding some PS format 2013-04-26 20:07:25 +02:00
Olof Larsson
9b3a87c0da Add a progressbar system 2013-04-26 17:54:53 +02:00
Olof Larsson
ff3219ea6e Money, ensure accounts exist before using them. If they are not players set balance to zero. 2013-04-26 08:03:22 +02:00
Olof Larsson
2c70489885 There we go 2013-04-25 13:31:15 +02:00
Olof Larsson
69c78d68a1 First attempt to color the help with requirementsAreMet color code. 2013-04-25 13:25:49 +02:00
Olof Larsson
ffab977475 Fix bugs with isSameChunk 2013-04-25 12:05:52 +02:00
Olof Larsson
1a3f153a08 Improve entity.changed(), it now checks for attachment and inited. 2013-04-25 08:34:59 +02:00
Olof Larsson
18bb47007e Minor change to the modulo task 2013-04-24 09:00:05 +02:00
Olof Larsson
2db041fea4 Minor tweaks to the Money static. 2013-04-22 09:24:00 +02:00
Olof Larsson
35599952e8 With custom naming for block command senders that follow no special rules for the ID there is not much we can do. Also the reverse lookup was doomed to fail from the beginning. Removing that feature and make the system more compatible with the current situation. 2013-04-21 10:08:35 +02:00
Olof Larsson
c24a9a63dc Fix some comments and indent style 2013-04-20 15:50:50 +02:00
Olof Larsson
dc15ec2d6c Now that I think of it the default case is the null case. 2013-04-19 18:58:34 +02:00
Olof Larsson
e8e8de834b Fore the sake of inception add in experimental money support in mcore through Vault. 2013-04-19 18:25:47 +02:00
Olof Larsson
2b7b45b7d3 Working some one the MCore event classes. I will lie and say that all events are cancellable. In situations where we dont want them to be cancellable we can simply not care about that boolean. 2013-04-19 15:13:30 +02:00
Olof Larsson
59b133284e Adding potion utilities to mcores mutil. 2013-04-18 17:13:13 +02:00
Olof Larsson
6f7b10bfb0 Some random additions. Factions stuff that fit into the STD. 2013-04-18 14:17:07 +02:00
Olof Larsson
0ffa24b15e Optimize equals slightly? Like it matters. 2013-04-17 17:14:58 +02:00
Olof Larsson
9b0845f2c3 Improve the PS deserialization logic so it understands LazyLocation from older versions of Factions. 2013-04-17 11:53:55 +02:00
Olof Larsson
cb02cc3ee9 Adding in a standardised version command. 2013-04-16 13:18:01 +02:00
Olof Larsson
8e633ceb2b Moving lowercasing logic to Coll and alter constructors to get rid of uuid as default and troll myself. 2013-04-16 09:23:55 +02:00
Olof Larsson
135e2ce27b Use NaturalOrderComparator instead of built in Java one for strings. 2013-04-12 15:07:34 +02:00
Olof Larsson
d2bad2bb20 Get rid of Auto Increment alltogether. 2013-04-12 14:36:49 +02:00
Olof Larsson
7a358a80d5 Since I only used String ids for now, let's assume that's always the case. Saves us a lot of generics-crap. 2013-04-12 14:05:14 +02:00
Olof Larsson
21dac166eb Messing around with UUID's and ObjectId's. 2013-04-12 11:39:47 +02:00
Olof Larsson
6e15d22eda Some source code formatting to the id-strategies. 2013-04-12 10:54:56 +02:00
Olof Larsson
63b3eae101 Some improvements to the auto increment system. 2013-04-12 10:42:58 +02:00
Olof Larsson
6b4e8e5502 Added better valueOf methods for chunk PS by coord. 2013-04-11 11:27:57 +02:00
Olof Larsson
ac524cd559 Add in a chunk coord plus method for PS 2013-04-11 08:48:36 +02:00
Olof Larsson
6d0e2f7669 Make PS comparable and have equals make use of the compare methods. 2013-04-11 08:19:15 +02:00
Olof Larsson
95f1dc8dd0 Require Plugin only and not MPlugin in MStore. 2013-04-11 07:19:05 +02:00
Olof Larsson
d4f30331ef Do not require MPlugin if Plugin is sufficient 2013-04-10 11:08:13 +02:00
Olof Larsson
9a6cae780d Add MCoreCancellableEvent 2013-04-10 09:04:20 +02:00
Olof Larsson
e00cd2afc8 Rename collections. This is a breaking change that will require manual fix. Remember to warn other users. 2013-04-10 08:58:55 +02:00
Olof Larsson
b7a88095d3 More stuff in cooldown system test component. 2013-04-05 09:19:13 +02:00
Olof Larsson
cae94f01f6 first draft and cooldown component 2013-04-03 09:35:23 +02:00
Olof Larsson
79d382ee40 Made command registering override per default. 2013-03-28 10:51:25 +01:00
Olof Larsson
61d7b7cb12 Moved the tpdelay to the mstore conf. 2013-03-26 10:37:42 +01:00
Olof Larsson
edabc02555 Implemented a mstore mcore config with custom permission denied formats. 2013-03-26 10:20:00 +01:00
Olof Larsson
d274874092 Conf should be called ConfServer. 2013-03-26 09:50:19 +01:00
Olof Larsson
2544fa0a6b Add a permission denied format event. 2013-03-26 09:43:23 +01:00
Olof Larsson
6fc7723466 Add a gson adapter for PlayerInventory. 2013-03-26 09:16:09 +01:00
Olof Larsson
853fe36a5d InventoryUtil changes and PlayerUtil.isJoined- 2013-03-25 13:50:37 +01:00
Olof Larsson
f8d29d98aa More tweaks to the inventory stuff 2013-03-23 17:24:38 +01:00
Olof Larsson
9cc687dab0 Experimental PlayerInventory serdes support. 2013-03-23 16:14:13 +01:00
Olof Larsson
4c70897d87 Update for R2 2013-03-22 17:31:16 +01:00
Olof Larsson
90f2c1059b More work to the inventory util. 2013-03-22 11:05:06 +01:00
Olof Larsson
c12c1ac765 Working with InventoryUtil and removing NMS references. 2013-03-22 10:20:11 +01:00
Olof Larsson
e1687d24a6 Adhere to some conventions. 2013-03-21 10:33:36 +01:00
Olof Larsson
ea17db7298 Minor changes to teleport mixin 2013-03-20 14:43:33 +01:00
Olof Larsson
2ff98d2ddb Initial update to 1.5 2013-03-17 11:19:20 +01:00
Olof Larsson
478c60156c fix broken logic 2013-03-15 13:04:06 +01:00
Olof Larsson
de88118d78 Ids etc may contain spaces. Thus I added argConcatFrom with argreader 2013-03-15 12:57:29 +01:00
Olof Larsson
3163253c49 New utility methods in InventoryUtil 2013-03-14 17:59:46 +01:00
Olof Larsson
ad06dd854c Making argument index optional and heavy OCD 2013-03-14 12:35:42 +01:00
Olof Larsson
92ac999c2e implement Cloneable just because we can, trim entity velocityY 2013-03-13 08:23:37 +01:00
Olof Larsson
b324024c20 Making PS2 the defacto standard by renaming it to PS and fix issues that occurred. 2013-03-12 20:13:10 +01:00
Olof Larsson
3b0a3eff59 Moved to new package, created PSFormater system, added static comparators such as locationDistance and inSameUniverse 2013-03-12 17:36:22 +01:00
Olof Larsson
19a21d25a1 Refactored name constants and added in the old introduction since it is still valid. 2013-03-12 15:25:34 +01:00
Olof Larsson
09f2d8b8b7 Throw exceptions instead of returning null 2013-03-12 15:01:06 +01:00
Olof Larsson
006e0435a4 Transparent paste method simply called "with" 2013-03-12 14:43:24 +01:00
Olof Larsson
69adda27ed Value of Bukkit Equivalents 2013-03-12 14:27:06 +01:00
Olof Larsson
6c6ea61b5c Field groups, asBukkitEquivalents, renamed worldName --> world 2013-03-12 13:47:26 +01:00
Olof Larsson
cfbfe9b4aa Builder and value of JsonElement 2013-03-12 11:23:34 +01:00
Olof Larsson
3999d8e081 Fixed typo in current PS version, made constants of serialized gson names, added with-pseudo-setters. 2013-03-12 10:43:20 +01:00
Olof Larsson
16aaf820ff Starting work on new immutable PS class 2013-03-12 10:27:49 +01:00
Olof Larsson
1982709181 rename 2013-03-12 08:33:20 +01:00
Olof Larsson
9fe7a9c489 Added actuall mixin 2013-03-12 07:51:38 +01:00
Olof Larsson
8dbb8f793d Minor utilities and fixes 2013-03-07 12:55:20 +01:00
Olof Larsson
8c5c35c725 The entity class may now decide when it's default 2013-03-06 14:50:38 +01:00
Olof Larsson
941478c574 Recoding TeleporterMixin 2013-03-05 17:14:13 +01:00
Olof Larsson
e07241d4d7 Adding in an event on PS teleportation. 2013-03-05 09:52:08 +01:00
Olof Larsson
2543fc306e Use oid and fixId everywhere for safety. 2013-03-04 11:04:51 +01:00
Olof Larsson
5c2752129d Improving command requirement Req 2013-03-02 16:29:20 +01:00
Olof Larsson
65f84c25fe new senderId sources and minor message mixin fix. 2013-03-02 15:56:11 +01:00
Olof Larsson
8e071f2f6f New features for the message mixin. 2013-03-02 15:41:05 +01:00
Olof Larsson
b00eb28834 Adding debug output to the protocol lib useage location to get more data. 2013-03-01 13:10:56 +01:00
Olof Larsson
148b09542d Remove debug output I forgot about. 2013-03-01 12:56:06 +01:00
Olof Larsson
fc22f60e37 Removed the old version of the item stack adapter. This is good since we loose some CraftBukkit usage. 2013-02-28 19:54:41 +01:00
Olof Larsson
8c11390bf9 I heard Lombok actually wasn't that fun. So I removed it. 2013-02-28 19:44:30 +01:00
Olof Larsson
f1acaf8143 Removed potion packet util and added MCoreEntityPotionColorEvent. 2013-02-28 12:48:09 +01:00
Olof Larsson
bd1e2e29de Scheduled teleports should not depent on tickrate. 2013-02-27 08:27:28 +01:00