JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,598 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

5598 Commits

Author SHA1 Message Date
Christopher Jozsa 8717f962e6 Merge pull request #83 in MIN/mineplex from mrsomeone12_SmallFixes to master 
* commit 'c98b427fdebb0d8abcce3a17731c0f9b35eece01':
  Added missing MountData and SingleEntityMountData files.
  Mount bug fix.
  Added method to edit NoAI field on entities.
  Implemented new mount data system replacing instead of entities as data.
  We only need to add the "Go Back" page once...
  TitanMount fixes
 2015-12-03 17:15:21 -06:00
NewGarbo 39daf969fd clan claim visualizer 2015-12-03 22:29:36 +00:00
NewGarbo 584a02ae3e fixed infinite claims 2015-12-03 10:30:06 +00:00
Christopher Jozsa fc0cae8e0f Merge pull request #85 in MIN/mineplex from virizion_utils to master 
* commit 'bf92af647abceb78596f9fd1922d3522e61ff053':
  Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).
 2015-12-02 18:53:30 -06:00
Shaun Bennett 717508529c Merge pull request #86 in MIN/mineplex from clans-beta to master 
* commit 'e9fd661311910c81c287ca146d5f22ccbe80dfcc': (22 commits)
  disabled koth
  fixed message on tick (might be cause of laggg)
  a few last touches
  forcejoin command for ADMIN+ and fixed auto tree replanting.
  made it so that you can only use /reset in safe zones
  modifications
  changes to tutorial
  fixed skiptutorial message not displaying
  bunch o' changes
  made skip tutorial messages be seen whilst in tutorial
  made entire clan know about disband
  fixed players from being able to eat their carrot in the making money task
  fixed some annoying bugs and fixed certain messages not showing in tutorial
  made certain messages visible in tutorial that are actually required to be seen
  Got rid of deployed tasks. using different system now. (untested)
  made it so players cannot see chat whilst in tutorial
  whoops.. this isn't php hehe
  made it so that no messages are shown when in tutorial
  fixed doors getting placed in spawn and shops
  removed some testing stuff
  ...
 2015-12-02 18:52:16 -06:00
NewGarbo e9fd661311 disabled koth 2015-12-02 18:25:53 +00:00
NewGarbo 8fea5afdce fixed message on tick (might be cause of laggg) 2015-12-02 06:56:58 +00:00
NewGarbo 92c1abf221 a few last touches 2015-12-02 06:04:53 +00:00
NewGarbo 8db5ffe5c7 forcejoin command for ADMIN+ and fixed auto tree replanting. 2015-12-02 05:54:00 +00:00
NewGarbo 3a4e453ac3 made it so that you can only use /reset in safe zones 2015-12-02 05:18:04 +00:00
NewGarbo d6ca52e4a4 modifications 2015-12-02 05:11:09 +00:00
Virizion bf92af647a Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames). 2015-12-02 00:00:32 -05:00
NewGarbo b8e2086928 changes to tutorial 2015-12-02 00:19:48 +00:00
NewGarbo ba27d94158 fixed skiptutorial message not displaying 2015-12-01 23:23:11 +00:00
NewGarbo cffb6bd62f bunch o' changes 2015-12-01 23:01:41 +00:00
Keir 9508556d57 Refactor. 2015-12-01 22:47:51 +00:00
NewGarbo a7d6026c07 made skip tutorial messages be seen whilst in tutorial 2015-12-01 22:33:47 +00:00
NewGarbo 69cb395f5a made entire clan know about disband 2015-12-01 22:30:05 +00:00
NewGarbo 35ae89ab1f fixed players from being able to eat their carrot in the making money task 2015-12-01 19:37:53 +00:00
NewGarbo ea099d7a82 fixed some annoying bugs and fixed certain messages not showing in tutorial 2015-12-01 18:41:33 +00:00
NewGarbo fbf9c8eb0c made certain messages visible in tutorial that are actually required to be seen 2015-12-01 13:37:34 +00:00
NewGarbo f536bf23e5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-12-01 12:06:25 +00:00
NewGarbo d32e6fdb96 Got rid of deployed tasks. using different system now. (untested) 2015-12-01 11:28:14 +00:00
Jonathan Williams 633697dc7a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-30 23:49:32 -06:00
Jonathan Williams 03a1f19df9 Fixed memory leaks in Disguise and Recall. 
Removed debug messages in ItemMapManager
 2015-11-30 23:49:16 -06:00
Cheese 51023a7630 cosmetic cooldown fix 2015-12-01 15:38:54 +11:00
Cheese 208eaf3a01 cosmetics recharge slowdown 2015-12-01 11:38:52 +11:00
xGamingDudex c98b427fde Added missing MountData and SingleEntityMountData files. 
For some reason, git decided that it was a good idea to remove these two
files from the index...
 2015-12-01 00:46:20 +01:00
Cheese 1a1fa684e4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-01 10:44:39 +11:00
Cheese 7217cd0f33 remove conditions upon death 2015-12-01 10:44:13 +11:00
Christopher Jozsa 26b374f4f0 Merge pull request #84 in MIN/mineplex from virizion_utils to master 
* commit '9d380a0b317b321831688eb7b9b3f4eb21281ad6':
  Added an utility method in UtilBlock to get an ItemStack from a block and also handles correcting Material types and Data Values.
 2015-11-30 17:34:24 -06:00
Virizion 9d380a0b31 Merge remote-tracking branch 'remotes/origin/master' into virizion_utils 2015-11-30 17:47:08 -05:00
Virizion 666b9963e4 Added an utility method in UtilBlock to get an ItemStack from a block and also handles correcting Material types and Data Values. 2015-11-30 17:42:48 -05:00
NewGarbo 18504e48f7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-30 21:00:42 +00:00
NewGarbo 1a851679c4 made it so players cannot see chat whilst in tutorial 2015-11-30 20:40:30 +00:00
Jonathan Williams 482ec8a120 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-30 14:26:37 -06:00
Jonathan Williams 513810caaa Fixed memory leak in MarkedForDeath 2015-11-30 14:26:25 -06:00
NewGarbo 6eb44ed87b whoops.. this isn't php hehe 2015-11-30 19:11:18 +00:00
NewGarbo 813e7ee789 made it so that no messages are shown when in tutorial 2015-11-30 19:08:16 +00:00
Keir 0bbb705654 Small method & class renames, document methods. 2015-11-30 16:35:07 +00:00
NewGarbo 0862cfce72 fixed doors getting placed in spawn and shops 2015-11-30 07:26:02 +00:00
NewGarbo 261d6dd030 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-30 07:08:34 +00:00
NewGarbo f528531b82 removed some testing stuff 2015-11-30 07:06:36 +00:00
Keir 4aa84b9180 Store chat messages from the last 30 minutes. 2015-11-30 02:03:26 +00:00
Shaun Bennett 34c4bade06 Merge remote-tracking branch 'origin/master' 2015-11-29 19:30:51 -05:00
Cheese 02bc7ffab6 map changes 2015-11-30 11:17:23 +11:00
Shaun Bennett 981eead816 Merge remote-tracking branch 'origin/master' 2015-11-29 19:05:56 -05:00
Cheese 0f79b5814f more color f ixes 2015-11-30 10:52:44 +11:00
Shaun Bennett 25bb913c4f Merge remote-tracking branch 'origin/master' 2015-11-29 18:41:35 -05:00
Cheese 2ac21b1434 better colors 2015-11-30 10:40:57 +11:00