Commit Graph

1016 Commits

Author SHA1 Message Date
William Burns 4620a5a162 Hub fix 2015-11-18 21:47:52 +00:00
Jonathan Williams 88dbe261db Added logging for stacker. 2015-11-15 18:34:35 -06:00
Cheese e7b86b4462 hub skytext 2015-11-14 13:05:11 +11:00
Cheese 9de3981dec ms update 2015-11-13 11:24:11 +11:00
Shaun Bennett bbc7bf770c 1.8 Fixes - Still doing map fix 2015-11-12 19:18:42 -05:00
Shaun Bennett 639d2d110f Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-11-12 17:55:33 -05:00
Shaun Bennett 0b41450603 Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""
This reverts commit 6c17b2926c.
2015-11-12 17:51:13 -05:00
Shaun Bennett 6c17b2926c Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"
This reverts commit ce1c09b88f, reversing
changes made to 1aef7fe0b9.
2015-11-12 16:35:31 -05:00
AlexTheCoder bc1b185f0e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-12 02:44:54 -05:00
NewGarbo ce1c09b88f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
	Plugins/Libraries/craftbukkit.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
2015-11-11 19:35:44 +00:00
Jonathan Williams 0e6146d5c9 Added expire to Stacker throw. 2015-11-11 04:32:56 -06:00
fooify 394d680470 Merge remote-tracking branch 'origin/master' into monster-league 2015-11-10 07:09:19 -08:00
fooify ca1177685f totally WIP commit 2015-11-10 07:08:08 -08:00
AlexTheCoder d654f1f4b1 - Fixed class edit in lobbies
- Fixed conflict between rave suit and assassin
2015-11-10 06:17:25 -05:00
AlexTheCoder e165cad50f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-10 04:53:32 -05:00
Shaun Bennett 2707173a8b Merge with 1.8 Branch 2015-11-10 01:48:33 -05:00
NewGarbo 7a8a5918c0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
	Plugins/.idea/dataSources.xml
	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java

** CONFLICTS ALL FIXED **
2015-11-09 08:59:37 +00:00
Shaun Bennett 2eaa326929 Merge remote-tracking branch 'origin/master' 2015-11-09 03:27:50 -05:00
Shaun Bennett 2c54e9e59a Giveaway extras 2015-11-09 03:27:42 -05:00
Jonathan Williams 283a774e03 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-09 00:04:55 -06:00
Jonathan Williams ff936784d3 Remove debug code. 2015-11-08 17:27:00 -06:00
Jonathan Williams e86623c8d0 Disabled TrickOrTreatManager to test for Lobby lockups. 2015-11-08 17:26:43 -06:00
AlexTheCoder dfbf19c66a Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-08 01:02:06 -05:00
Shaun Bennett 3c82574386 Testing pushing/ignore this 2015-11-07 20:02:07 -05:00
libraryaddict 79d0466355 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-11-07 21:36:36 +13:00
Cheese c922c3248c disabled trick or treat 2015-11-07 13:36:16 +11:00
Cheese f4bf685e96 removed halloween hub
removed titan giveaway and pumpkins
2015-11-07 13:20:29 +11:00
Shaun Bennett 4add7449eb Merge remote-tracking branch 'origin/master' 2015-11-06 21:15:45 -05:00
Shaun Bennett 3893617d58 Logitech Giveaway (still needs testing) 2015-11-06 21:15:37 -05:00
AlexTheCoder fafc92606c Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
2015-11-06 18:43:11 -05:00
libraryaddict cc0f12f6c8 Fix player interactions packets not working properly on armorstand and when clicking block behind entity 2015-11-07 04:45:02 +13:00
AlexTheCoder 9c49ab0408 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-05 01:23:40 -05:00
NewGarbo 7f03ca0936 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java
2015-11-03 21:19:17 +00:00
libraryaddict 975ad9e6ea Update to master 2015-11-03 15:05:56 +13:00
libraryaddict 3de906ab19 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
2015-11-03 14:57:25 +13:00
Jonathan Williams 3b38302429 Optimized TaskManager task locks and calls.
Run all player messages on the main thread.
2015-11-02 09:35:35 -06:00
Jonathan Williams 55d028d706 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-01 22:09:58 -06:00
Jonathan Williams 18bdcbec62 Fixed some NPEs with TrickDialogue
Added debug messages for Tricks.

Cleanup of monster targets in HubManager.
2015-11-01 22:09:36 -06:00
Cheese cdb0fcae75 modified hideme a little :) 2015-11-02 14:37:12 +11:00
Sarah da6bf27c77 Staff with a higher rank can see lower rank and same ranked vanished staff. 2015-11-02 04:32:07 +01:00
Jonathan Williams f16eee220d Removed Debug messages. 2015-10-31 14:55:18 -05:00
Jonathan Williams 073321fb14 Refactored TrickOrTreat Stuff. 2015-10-31 14:45:42 -05:00
Shaun Bennett 71e49854db Add halloween hats 2015-10-31 02:10:15 -04:00
Mysticate 1a6617bce1 Changes. 2015-10-31 02:05:03 -04:00
libraryaddict 519dceb72e Doublejumping downwards is a no no 2015-10-31 19:02:58 +13:00
Cheese 23be8aa1dd removed unncessary stuff
balanced rewards
2015-10-31 14:33:41 +11:00
Mysticate 4884032a1a Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3 2015-10-30 23:24:32 -04:00
libraryaddict 0486404c4b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-10-28 14:38:34 +13:00
NewGarbo 1e4b3442fa Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
2015-10-24 20:45:39 +01:00
libraryaddict 43cd0f86a9 Fix players unable to break blocks at spawn 2015-10-24 08:40:57 +13:00
Shaun Bennett 40afcaf26b Global Packet Commands 2015-10-23 15:07:53 -04:00
AlexTheCoder f7dab72e8c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-10-23 03:23:35 -04:00
Cheese af208da953 Merge branch 'alex-testrank' 2015-10-23 18:10:59 +11:00
Shaun Bennett e3e7dd4694 Titan rewards from mythical chests 2015-10-23 02:08:31 -04:00
AlexTheCoder 1512d87f9e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank 2015-10-23 00:28:32 -04:00
libraryaddict ddb8d592f8 Remove all is1_8 checks 2015-10-22 18:37:14 +13:00
AlexTheCoder 12319169a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/RadarData.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilRadar.java
2015-10-18 00:54:18 -04:00
Shaun Bennett 523378aae7 Clans War updates 2015-10-17 22:55:21 -04:00
libraryaddict 3a0781b3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
2015-10-17 00:10:32 +13:00
libraryaddict 14a524cf54 Stuff 2015-10-17 00:08:30 +13:00
Jonathan Williams d00fa856f3 Fixed Pets so they work correctly.
Also fixed legend benefits.
Fixed chest pet rewards.
2015-10-16 01:57:19 -05:00
libraryaddict 3dda9352e7 Progress 2015-10-16 13:32:23 +13:00
Shaun Bennett f683e932ae Clans merge fixes 2015-10-13 22:24:15 -04:00
Shaun Bennett 88709f85b6 Merge with master 2015-10-13 18:13:01 -04:00
libraryaddict 58a86c5abb That's the easy stuff done.. 2015-10-13 19:49:15 +13:00
AlexTheCoder f497eab633 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-10-12 17:54:11 -04:00
AlexTheCoder bef942f6da Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank 2015-10-12 00:47:56 -04:00
Cheese 7bc3b4970b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
2015-10-10 17:34:17 +11:00
Mysticate 930cfa5cb8 DONE 2015-10-10 02:30:11 -04:00
Mysticate 245a42c8e0 animation is sexi 2015-10-10 02:13:04 -04:00
Mysticate 30a9196430 Done with animation. 2015-10-10 01:43:31 -04:00
Mysticate 9a7357e484 Work 2015-10-10 01:00:49 -04:00
Mysticate 1127764cc3 Secsi 2015-10-09 22:44:49 -04:00
Mysticate 7851cb451a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
2015-10-09 22:34:05 -04:00
Shaun Bennett aa9fd1abf3 Titan giveaway work 2015-10-09 22:14:10 -04:00
Mysticate 90c685617d Animation 2015-10-09 22:14:01 -04:00
Cheese ed89f5f4cc anim example for myst 2015-10-10 10:46:12 +11:00
Cheese 43f38c18ee animation 2015-10-10 10:40:44 +11:00
Cheese 02c6eccfda Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
2015-10-10 10:36:42 +11:00
Cheese 7dbd9da582 dragon sale Bar 2015-10-10 10:35:48 +11:00
Jonathan Williams 586cc6e3e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-09 09:40:58 -06:00
Mysticate cdb9741438 Changed the SG icon in hub, fixed EULA breaking thing in Class Shop 2015-10-08 20:36:16 -04:00
Cheese 3c437925f1 halloween prep 2015-10-08 12:36:00 +11:00
Cheese e2e2356b04 stuffs 2015-10-06 13:25:15 +11:00
Jonathan Williams 631bd9cfa6 Removed sale notification.
Removed queue create table query.

Added try-catch for ServerMonitor to prevent stat storage from affecting normal operation.
2015-10-01 07:38:59 -07:00
Ty Sayers b4c9bfbb57 Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/.classpath
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
	Plugins/Mineplex.Hub/.classpath
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java
2015-09-29 18:09:52 -04:00
AlexTheCoder 49908e7550 - Added game to hub text 2015-09-25 04:28:11 -04:00
AlexTheCoder a488bfab3e - Rewritten testrank system
- Multiple rank improvements for real-time use
- Removed /updaterank from Jr.Dev
2015-09-24 11:44:45 -04:00
Shaun Bennett cf618abd4e BotSpam Module 2015-09-22 01:38:45 -04:00
libraryaddict 5e8fc77164 Add pages to spectator and in-progress server menu 2015-09-17 04:34:45 +12:00
Cheese 4184fe20cf minor fixes 2015-09-12 14:09:04 +10:00
Cheese 0ac808ba43 stacker pref is now only for pvp stacking. 2015-09-05 10:30:11 +10:00
Cheese fc5ccd4a5e fixed 'self scoring' in Soccer
removed silverfish on wither pet despawn
2015-09-05 10:04:54 +10:00
Cheese 106a7dab2e removed ability for entities to change blcoks in hub 2015-09-05 09:48:06 +10:00
Ty Sayers 54f910845e Fix bug where murders were not properly taking place in certain instances of players wielding weapons or armour as well as in certain claimed areas. Fix bug where BlockToss could be exploited to break into an enemy clan's claimed base. Fixed bug where percent sign was not properly escaped in certain item attributes. Remove debug line from shop. 2015-08-30 12:28:44 -07:00
Ty Sayers c1b356e42f Fix asynchronous race conditions in ServerData. 2015-08-29 19:05:14 -07:00
Ty Sayers da3810e5a3 Fix bug where any server initializing the ClanRepository was marked as a clans server in the database. Fix bug where administrative clans were being duplicated across different clans servers. 2015-08-29 17:57:18 -07:00
Ty Sayers 138a4cf638 Fix bug where transferring a clan to destination server would not load properly server-side. 2015-08-29 17:43:12 -07:00
Ty Sayers f47c1b5c14 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-29 17:33:08 -07:00
Ty Sayers 5df7a5e0c9 Fix bugs related to multiple server UI and clan server transferring. 2015-08-29 17:31:54 -07:00
Shaun Bennett 820bc1af44 Setup new module for intellij, fix field ore 2015-08-29 16:56:26 -07:00
Ty Sayers 197309b914 Commit left-over changes to merge and pull. 2015-08-29 15:44:29 -07:00
Ty Sayers aad5942242 Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server. 2015-08-29 14:46:18 -07:00
Mysticate ebd3fbe6d5 Merge remote-tracking branch 'origin/master' into Myst_EVO 2015-08-28 20:19:27 -06:00
Jonathan Williams e9b33668bc Added donorsOnline to MinecraftServer snapshot
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
Shaun Bennett cd145324d8 Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit 2015-08-28 12:00:23 -07:00
Ty Sayers a9f5197c64 Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Database/src/mineplex/database/Account.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
2015-08-22 15:18:51 -04:00
Jonathan Williams bbe5b79c7e Disabled AntiHack create table.
Fixed NPE with ServerManager
2015-08-19 04:11:34 -05:00
Mini-Chiss 14bf8faf3a disabled big sale 2015-08-18 09:49:53 +02:00
Shaun Bennett 8ab8388344 Merge remote-tracking branch 'origin/master' 2015-08-17 05:05:36 -05:00
Shaun Bennett dc8bec340e Rename Quick game menu for consistency 2015-08-17 03:18:35 -05:00
Mini-Chiss 7a7543886f fixed a ton of commands NPEing on no args 2015-08-17 09:04:39 +02:00
Mini-Chiss 91ce9cfba7 fixed a crash with fireworks 2015-08-16 08:39:03 +02:00
libraryaddict a1ea03f74b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
Conflicts:
	Plugins/.idea/misc.xml
	Plugins/.idea/modules.xml
	Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
	Plugins/Mineplex.Database/src/mineplex/database/Routines.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
2015-08-14 19:44:56 +12:00
Mini-Chiss 5fa9135b08 renamed soccer to slimeball :) 2015-08-13 14:11:22 +02:00
Mini-Chiss 534c91c706 remove items from inside soccer 2015-08-13 13:24:55 +02:00
Jonathan Williams a308244966 Merge pull request #29 in MIN/mineplex from foo to master
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
  minor grammar issue
  remove duplicate method
  manually updating something
  *crosses fingers* please work!
  please work...
  Freezes the time using doDayLightCycle instead of using a UpdateEvent.
  Fixed double-half-slabs (line 68)
  remove custom level to fix merge conflicts
  squirrel!
  fix getting snowballs from bedrock
  add jnr_dev to updaterank
  fix this agaaaaain
  FOOIFY IS A NOOB OKAY
  fix concurrentmodificationexception
  fix turfforts bug
  prevent STATIONARY_LAVA from breaking in creeper smash
  fix creeper smash exploding lava and bedrock
  fix spleef lava issue
  ishh also wanted this :P (let me know if I should remove it)
  ishh wanted it...k
  ...
2015-08-13 01:49:00 -05:00
Mini-Chiss fcfb2559b8 players cannot grab slime :O 2015-08-12 14:41:33 +02:00
Mini-Chiss d1302e8dc3 fixed full msg 2015-08-12 12:42:59 +02:00
Mini-Chiss 5293e24469 fixed text 2015-08-12 11:58:40 +02:00
Mini-Chiss cd5c7e7110 fixed kb 2015-08-12 11:23:19 +02:00
Mini-Chiss f19efb4a93 renamed football to soccer 2015-08-12 09:23:00 +02:00
Mini-Chiss 7cda53cb28 carl spinner in arcade/
tutorial fixes
2015-08-12 08:36:21 +02:00
fooify 07bdbdde46 minor grammar issue 2015-08-11 09:55:10 -07:00
fooify 10f979772b Merge remote-tracking branch 'origin/master' into foo 2015-08-11 09:51:13 -07:00
Shaun Bennett fe153bee11 Fix revert issues 2015-08-11 03:19:27 -05:00
Mysticate bd414cd231 Merge remote-tracking branch 'origin/master' into Myst_EVO
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
2015-08-10 19:47:53 -04:00
Mini-Chiss 65b51a137c new party tute room 2015-08-10 14:50:44 +02:00
Mini-Chiss bd2c9aa5e6 hub stuff 2015-08-10 14:00:02 +02:00
Shaun Bennett 8745884153 Various fixes 2015-08-10 04:51:11 -05:00
Shaun Bennett b8b19ed4a5 Merge remote-tracking branch 'remotes/origin/master' into Bonus
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-08-10 03:24:59 -05:00
Shaun Bennett 6f8d6f8a40 Move Bonus and Poll to core 2015-08-10 01:55:50 -05:00
Shaun Bennett a0be3fa964 Use atomic mysql operations for modifying tickets 2015-08-10 01:19:10 -05:00
Shaun Bennett 511cc76bef Allow servers to process votifier votes, redis command gets sent to all servers (Until I can figure out why EU playertracker isnt working) 2015-08-10 00:47:36 -05:00
Shaun Bennett 28806aaf0a Update Bonus amounts, Attempting to fix Votifier plugin for EU/US 2015-08-10 00:33:54 -05:00
Shaun Bennett d20fe54010 Disable carl features when carl can't be found 2015-08-09 16:36:48 -05:00
Mini-Chiss c2d066a576 ui fixes 2015-08-09 19:31:24 +02:00
Mini-Chiss 41dcc564c9 polish polish polish
MAKE IT SHINE!
2015-08-09 19:02:07 +02:00
Sarah 8c66ef7f15 changing Hub items and adding Profile GUI. 2015-08-09 18:33:44 +02:00
Mini-Chiss 5a7de8ef3d hub fixes 2015-08-09 17:21:56 +02:00
Sarah 941e746ca9 Finalizing Poll GUI in Carl's GUI. 2015-08-09 16:47:03 +02:00
Sarah 85c8e42f53 Finalizing and improving the Carl spinner and adding creeper explosion animations. 2015-08-09 15:00:54 +02:00
Shaun Bennett e6519206af Add event to be called when a player tries to buy a carl spin 2015-08-08 16:29:03 -05:00
Mini-Chiss cbb0cb96c8 ensured white 2015-08-08 13:54:35 +02:00
Mini-Chiss e030331565 fixed some bugs 2015-08-08 13:51:37 +02:00
Mini-Chiss fa7f19bde5 removed debug 2015-08-08 13:47:30 +02:00
Mini-Chiss 328c31de88 hub Update
fixed bad gameid
2015-08-08 13:47:09 +02:00
Shaun Bennett 4f6dfdb856 Update carl spin button to consume tickets, Updates to Votifier Plugin, Redis Vote Command, Various bug fixes 2015-08-08 06:35:25 -05:00
Mini-Chiss eab7aa59f2 hub update! 2015-08-08 09:27:49 +02:00
Mini-Chiss 47cb98066d Hub fixes 2015-08-08 08:19:07 +02:00