Commit Graph

1824 Commits

Author SHA1 Message Date
Chiss 6e6e0e2ae0 added flags to disable gem multipliers per-game. UHC was giving too much :O 2014-10-13 09:44:30 +11:00
Chiss a8d1cef933 Minestrike, ensure bomb does not get overridden. 2014-10-12 18:31:05 +11:00
Chiss 623cdb0f2c Allowed players to rejoin if disconnect within first 10 minutes of UHC. 2014-10-12 18:27:49 +11:00
Chiss 603c0cb66e Staggered UHC game teleports to help reduce lag. 2014-10-12 18:26:18 +11:00
Chiss 28285ab999 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-12 14:19:52 +11:00
Chiss 9cc28d1ad8 MAC Update 2014-10-12 14:19:35 +11:00
Jonathan Williams 3e92b02bab Fixed max slot bug with ultra/hero 2014-10-11 05:56:47 -07:00
Chiss 42d22ac38f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-11 23:10:09 +11:00
Chiss 1d3b792ed8 UHC head apple fixes 2014-10-11 23:09:56 +11:00
Jonathan Williams d3788e8ddc Fixed redis server time functions.
Added kill option for servers with motd Finished in servermonitor
2014-10-11 04:40:53 -07:00
Chiss 9c8ed5360d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-11 21:01:52 +11:00
Chiss 8e071f59d6 missing file 2014-10-11 20:59:36 +11:00
Jonathan Williams d407cc7c4c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-11 02:57:01 -07:00
Chiss 95a4a34b47 UHC announcement Title 2014-10-11 20:55:48 +11:00
Jonathan Williams 8ace0ce07c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-11 02:55:45 -07:00
Chiss 316ce38056 Changed Utility time to ms 2014-10-11 20:53:39 +11:00
Jonathan Williams 797dd002ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-11 02:43:56 -07:00
Jonathan Williams 1a10ddb6a4 Fix for Open in 2014-10-11 02:43:02 -07:00
Jonathan Williams a54b78fefa Added Mine-Strike to Quick Game menu.
Fixed up CoreClientManager's rank update.
2014-10-11 02:32:02 -07:00
Chiss a2df64787f remove players from closed game, on update 2014-10-11 20:30:40 +11:00
Chiss 961163c135 delaying return to hub 2014-10-11 20:26:08 +11:00
Chiss a7ceb24b15 Hub UHC time log 2014-10-11 20:10:48 +11:00
Chiss dc0709f17e HH Update
Added UHC to skytext for hub
2014-10-11 19:43:28 +11:00
Jonathan Williams 19afebe53d Added in mysql hooks for coins/gems/ranks for database conversion preperation.
Added in failover database calls in CoreClient/DonationManager
2014-10-11 01:32:22 -07:00
Chiss e2c72a3ae2 HH update 2014-10-11 14:28:00 +11:00
CoderTim 3422f48325 New acheivements 2014-10-10 21:49:03 -04:00
Chiss b61979a31f UHC anti-xray; veins can now contain multiple ores. prevents veins occluded by other veins being removed. 2014-10-10 19:05:04 +11:00
Chiss 7d1a62e810 UHC anti-xray visibility update 2014-10-10 18:58:12 +11:00
Chiss 0acaf2e426 removed anti-xray on coal 2014-10-10 18:56:21 +11:00
Chiss d0d2622ecc added UHC on-the-fly anti-xray 2014-10-10 18:54:38 +11:00
Chiss a739712dca fixed game autostart flag bug.
added UHC gem rewards
2014-10-10 15:26:04 +11:00
Chiss e3747b5183 Minestrike fixes
Hub UHC announcer
2014-10-10 13:07:59 +11:00
Chiss 232dd231d0 UHC joinability/MOTD
Minestrike spec shop bug fix
2014-10-10 10:49:39 +11:00
Chiss ffc2ff5058 Modifided output of friends list
- buttons to left side for alignment
- sorted by sent>offline>pending>online
- improved 'no friends' message
2014-10-09 12:15:45 +11:00
Chiss 4bed45c48c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-09 10:47:47 +11:00
Chiss 8701f9ddcc Added TabTitle
Converted MineStrike to use scoreboard name hiding
2014-10-09 10:35:54 +11:00
Shaun Bennett 4755965808 Merge remote-tracking branch 'origin/master' 2014-10-05 21:18:11 -05:00
Shaun Bennett 1bb3f23ba4 Update craftbukkit.jar with 1.8 scoreboard team nametag visibility 2014-10-05 21:17:32 -05:00
Shaun Bennett 2a2191f23b Saving some changes to craftbukkit -> adds 1.8 nametag visibility option for teams 2014-10-05 21:16:40 -05:00
Chiss 7a345dce95 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-05 13:40:15 +11:00
Chiss d3f87dff46 MineStrike update 2014-10-05 13:37:27 +11:00
Jonathan Williams bf11635616 Fixed GemHunter in StaffServer and added offline stat increment :) 2014-10-04 15:43:33 -07:00
Shaun Bennett 39b03b7533 Change time command to mod+ 2014-10-04 00:20:35 -05:00
Shaun Bennett 520ade8249 Merge remote-tracking branch 'origin/master' 2014-10-03 20:41:06 -05:00
Shaun Bennett ef82aa08b1 Time command for mod+ 2014-10-03 20:40:58 -05:00
Jonathan Williams 66457ded60 Fix initial friends date load for offline time. 2014-10-03 02:05:55 -07:00
Jonathan Williams 70122db510 Updated staff server gem hunter packages. 2014-10-03 01:56:02 -07:00
Jonathan Williams 9033843a31 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-03 01:50:35 -07:00
Jonathan Williams c641eab3c7 Fixed up friends. 2014-10-03 01:50:23 -07:00
CoderTim b78132ebfc Renamed NpcManager methods 2014-10-02 22:18:25 -04:00
CoderTim addc423c2d Added /npc clear back 2014-10-02 22:15:12 -04:00
CoderTim f6f484c134 Refactored /npc commands 2014-10-02 22:08:00 -04:00
Chiss 42e60d0856 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-03 11:27:37 +10:00
Shaun Bennett 4253c08682 Fix time 2014-10-02 20:25:50 -05:00
Chiss 8359c9a7b4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-03 11:17:53 +10:00
Chiss cda9234ad3 Fixed TimeInGame stat not recording sometimes 2014-10-03 11:17:36 +10:00
Shaun Bennett 825f08b6a7 Merge remote-tracking branch 'origin/master' 2014-10-02 20:01:45 -05:00
Shaun Bennett a6fea938b9 Fix some duplicate code 2014-10-02 20:01:33 -05:00
Chiss 17e34e2060 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-03 10:49:42 +10:00
Chiss 31ceaad7fe MineStrike audio update 2014-10-03 10:49:26 +10:00
Shaun Bennett 07576a2b12 Add gamesplayed and timeingame to gui 2014-10-02 19:48:25 -05:00
Jonathan Williams 9b2a2cbbd6 Fixed mounting blocks on yourself in 1.8
Added temp fix so 1.8 players can ride dragons again.
Removed Block form in parkour and fly for block form.
2014-10-01 02:12:11 -07:00
Jonathan Williams c2b84cc60f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-30 12:20:14 -07:00
Jonathan Williams 0228ef5921 Staff server work to include treasure chests/keys and gem hunter level 8, 12. 2014-09-30 12:20:01 -07:00
CoderTim a5a2c1a837 Partially done refactoring NpcManager 2014-09-30 11:03:23 -04:00
CoderTim ce306e88ed Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-30 02:45:28 -04:00
CoderTim 70fd8835ac Added GamesPlayed and TimeInGame stats 2014-09-30 02:45:20 -04:00
Shaun Bennett c7d34e70ef Merge remote-tracking branch 'origin/master' 2014-09-29 17:42:13 -05:00
Shaun Bennett 92f8dc7f61 Add velocity toggle for mod+ 2014-09-29 17:17:02 -05:00
Jonathan Williams 552a861c8b Fixed class path for PvP project. 2014-09-29 12:13:38 -07:00
Jonathan Williams 36cbe55a49 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-29 12:13:08 -07:00
Shaun Bennett 7892c442d0 Add show mac reports user pref for mod+ 2014-09-29 11:14:20 -05:00
CoderTim 578b5702bc Added commons-dbcp2.jar dependency to Mineplex.Core in eclipse 2014-09-27 04:18:19 -04:00
Peter Miller 1bf5debc06 Updating DDoSProtectionSwitcher switchServer() method to launch remote script for IP change instead of local. 2014-09-27 00:45:52 -04:00
Jonathan Williams eaee6c2733 AWork on FRiends. 2014-09-26 12:38:51 -07:00
Jonathan Williams 34baa8eafb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-25 23:27:19 -07:00
Jonathan Williams 8bca23f0ba Fixed bug with custom tag fix :P
Fixed bug with server group up time check in servermonitor.
2014-09-25 23:27:08 -07:00
Chiss 895878ee40 Removing old items, fix for a larger problemo 2014-09-26 09:33:12 +10:00
Shaun Bennett 7ee4f549f8 Merge remote-tracking branch 'origin/master' 2014-09-25 18:04:06 -05:00
CoderTim ba2f0e37ef Log changes in players' coins to database 2014-09-25 17:03:26 -04:00
Jonathan Williams 91ca7fa6c6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-25 05:37:21 -07:00
Jonathan Williams e29dd4ff71 Fixes for ServerMonitor. 2014-09-25 05:37:10 -07:00
Chiss 79e808814a Minestrike cleans up incendiary at the end of rounds 2014-09-25 20:52:13 +10:00
Jonathan Williams 1f0bd462e3 Fix for CustomTagFix leak. 2014-09-24 22:14:26 -07:00
Shaun Bennett f5c8b2b1ac Fix renaming pets for 1.8 clients 2014-09-24 22:31:09 -05:00
Shaun Bennett 57487e78cf Fix Gem Booster display bug 2014-09-24 21:59:25 -05:00
Jonathan Williams a54a2aadc0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-24 01:32:03 -07:00
Jonathan Williams d32085f05b Removed tab list stuff for friends.
Implemented rudimentary friends chat list.
removed unused code in server stuff.
Added null check for retrieving server statuses.
2014-09-24 01:31:56 -07:00
Chiss 969c7c0fde Music gadget fixes
Tournament point tally
Removed snow from frosty HorseMount
Added Tournament hub invite messages
2014-09-24 15:46:55 +10:00
Shaun Bennett efa03945cb Delete the MapParser zip file from root directory after copied 2014-09-23 17:05:21 -05:00
CoderTim efb3c26115 Switched back to the latest craftbukkit.jar 2014-09-22 03:59:28 -04:00
CoderTim acc056d32d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-22 03:56:16 -04:00
Chiss 5774de552d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-22 17:53:39 +10:00
Chiss a58335d906 Added GameStatManager.java 2014-09-22 17:46:36 +10:00
CoderTim 00c8bfbd61 Changed BungeeSign dependency to bukkit.jar to match dependencies in eclipse 2014-09-22 03:46:05 -04:00
CoderTim 77e21c0d99 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-22 02:53:55 -04:00
MrTwiggy 5c9ee3e79e Add ServerCommand system for live cross-server commands,. Update Queuer to support Redis based database and functionality. Fix ServerStatus start up dates to synchronize properly with central Redis time. Add new DataRepository's for easier dynamic object storage in redis. Update Portal server-transfers to support new cross-server command system rather than database stored server transfers. 2014-09-21 20:42:47 -04:00
CoderTim 1949de4fd7 Database implementation of NpcManager partially complete 2014-09-21 15:45:15 -04:00
Chiss 7ca4b6830b added in GameStatManager 2014-09-21 09:28:12 +10:00
Chiss 9fce0b1926 Added small cooldown to be able to click hub clock after your gamestate changes. (prevents accidental clicking)
Moved stat stuff to gamemanager.
2014-09-21 09:26:34 +10:00
Chiss 767a0247a6 More change to end game title :) 2014-09-20 16:36:30 +10:00
Chiss 6e60c301cf fixed Title for end game 2014-09-20 16:33:24 +10:00
Chiss d9677ddda2 Disabled saving game player log for non-tournament 2014-09-20 16:28:45 +10:00
Chiss a830c72d22 Jukebox will be removed. 2014-09-20 15:29:59 +10:00
Chiss be3e10a412 Treasure now reverts BlockRestore changes before changing blocks. Prevents artifact blocks being left behind. 2014-09-20 09:31:06 +10:00
Chiss 0d090d7bdc fixed issue with MASSSSSSSSSIVE PLANET SIZED gui scale
added lore to coins in GUI, to help new players and sell more ranks
slightly lowered hitbox for headshots in minestrike
2014-09-20 09:10:55 +10:00
Chiss 9bbac7578e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
2014-09-20 08:29:06 +10:00
Jonathan Williams 960b0aa69e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
2014-09-19 09:23:52 -10:00
Shaun Bennett ed85779876 Fix Treasure painball gun issue, fix parkour paintbull gun issue 2014-09-19 14:18:23 -05:00
Jonathan Williams 96498af626 Fixed parkour bug with gadget blocks.
Removed a ton of debug messages with inventory close.
2014-09-19 09:06:42 -10:00
Jonathan Williams d0edde9dbd Added rank benefit giver 9000
Added MineStrike to beta timer.

Updated official craftbukkit.jar
2014-09-19 02:57:35 -10:00
Jonathan Williams c8e755fe5f Reverted and merged twigs status update. (Needs fix on startDate.) 2014-09-18 22:22:01 -10:00
Jonathan Williams 239b021b0d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-18 22:03:49 -10:00
Jonathan Williams 18f2ef7564 Re-enabled SNAKE PARKOUR for hub. 2014-09-18 22:03:23 -10:00
Chiss 21c131273e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-19 18:01:52 +10:00
Chiss 91037384f9 Loot tweaks
Music fixes
some bug fixes
2014-09-19 18:01:38 +10:00
Jonathan Williams 7906f48262 Updated CoreClientManager to pull all account data via name request.
Cleaned up some code with pet administrator.

added logging if 0 rows were being saved in CommitChanges
2014-09-18 21:12:37 -10:00
CoderTim edce1c9f90 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-19 02:46:12 -04:00
CoderTim 8cb836d5b3 Fixed some achievement bugs 2014-09-19 02:46:04 -04:00
Chiss ed7eeab1a7 fixed exception 2014-09-19 16:13:11 +10:00
Shaun Bennett 5c791090fc Open all treasures after 60 seconds 2014-09-19 00:48:11 -05:00
Shaun Bennett 3d04b27898 Prevent Gadget block changes from affecting treasure 2014-09-18 23:03:08 -05:00
Shaun Bennett 1a9f676a61 Merge remote-tracking branch 'origin/master' 2014-09-18 22:41:32 -05:00
Shaun Bennett 3eb61135c9 Fix treasure message 2014-09-18 22:39:42 -05:00
Chiss 01a6ff6069 costume reward fix
hub builder including database
2014-09-19 13:01:49 +10:00
Shaun Bennett 1370a0eeac Clean up RewardRarity 2014-09-18 21:24:14 -05:00
Shaun Bennett aad3d59177 Merge remote-tracking branch 'origin/master' 2014-09-18 21:03:59 -05:00
Shaun Bennett 5d643c00d5 treasssssurreeeeees 2014-09-18 21:03:46 -05:00
Chiss 27587a2a11 fixed players being able to be pushed into portals by gadgets 2014-09-19 11:15:48 +10:00
Chiss a0e9d6f6fd fixed a portal break bug
reduced lag from coin bomb
2014-09-19 10:59:26 +10:00
Chiss 4b602c1b83 Inventory Update
added Jooq to Hub build
2014-09-19 10:36:41 +10:00
Shaun Bennett c93fee2b53 Fix typos for pets 2014-09-18 18:10:33 -05:00
Shaun Bennett ee64ff2bf6 Dispose of Shop if the InventoryOpenEvent gets cancelled 2014-09-18 17:48:35 -05:00
Shaun Bennett 2008dae57b Adjust treasure message 2014-09-18 17:38:05 -05:00
Shaun Bennett 51ad6d8368 Open Treasure chests through cosmetic gui, purchase treasure keys, some bug fixes 2014-09-18 17:33:05 -05:00
Shaun Bennett b8d157f99f Add costumes to RewardManager 2014-09-18 14:47:22 -05:00
Shaun Bennett 76df00978a Add music discs to RewardManager 2014-09-18 14:43:07 -05:00
Shaun Bennett 88a8e3a896 Hackyish way to log rewards given out in a database 2014-09-18 14:35:59 -05:00
Chiss ed59e03795 Loot update 2014-09-18 17:05:56 +10:00
CoderTim 8b14c85572 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-18 01:57:04 -04:00
CoderTim f8ee20c433 Record server name in basic game stats 2014-09-18 01:56:46 -04:00
Shaun Bennett e5d5cda9fd Merge remote-tracking branch 'origin/master' 2014-09-18 00:46:41 -05:00
Shaun Bennett 87bd5d8f7f Add coin party bomb to rare rewards, fix reward values from last commit 2014-09-18 00:46:33 -05:00
Chiss 3fd312ff95 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-18 15:45:01 +10:00
Chiss fed3d31374 MineStrike fixes 2014-09-18 15:44:48 +10:00
Shaun Bennett 6c4479298d Fix RewardManager bug, fooling around with animations 2014-09-18 00:41:56 -05:00
Shaun Bennett 9d0b99b7fc Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
	Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
2014-09-17 23:56:42 -05:00
Chiss 09a3cc16b0 Reward stuffs 2014-09-18 14:36:22 +10:00
Chiss bb8e481c7f More Reward stuff 2014-09-18 14:25:39 +10:00
Chiss c625fb4121 Restructured rewards for Post-Game rewards 2014-09-18 13:21:30 +10:00
Shaun Bennett 33d33f84b4 More treasure animation touches + fixes 2014-09-17 15:22:54 -05:00
Shaun Bennett da680359d0 Change formatting of treasure announcements 2014-09-17 14:50:34 -05:00
Shaun Bennett 90e402bf69 Fix menu slots 2014-09-17 14:43:58 -05:00
Shaun Bennett 0139e40957 Re-enable Coin Party Bomb reward for rare treasures 2014-09-17 14:35:43 -05:00
Shaun Bennett cc5db5939d Add Music and Costume pages to cosmetic menu 2014-09-17 14:34:57 -05:00
Chiss 8780d5e4ee MS fixes 2014-09-17 11:18:59 +10:00
Chiss 16214613fe Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-17 08:59:23 +10:00
Chiss e6797582f9 Minor fixes 2014-09-17 08:59:09 +10:00
Shaun Bennett 50fa8b02f1 Use explosion particles instead of createExplosion 2014-09-16 17:57:34 -05:00
Shaun Bennett 918a817283 More treasure bug fixes and animation touches 2014-09-16 15:04:42 -05:00
CoderTim 6eed36f0ee Accidentally committed with line of code commented out 2014-09-15 23:46:44 -04:00
CoderTim d3b541dc27 Updated Arcade .classpath 2014-09-15 23:43:13 -04:00
CoderTim d5313540d7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-15 23:32:04 -04:00
CoderTim c5ff9da552 Record basic game stats (game type, timestamp, duration, winners, losers) 2014-09-15 23:31:53 -04:00
CoderTim c550e59d45 Renamed jooq database record classes 2014-09-15 23:30:24 -04:00
Shaun Bennett 5b77fa09a4 Merge remote-tracking branch 'origin/master' 2014-09-15 19:37:28 -05:00
CoderTim 1b416d3e6f Added database tables to record basic game stats 2014-09-15 16:36:59 -04:00
Shaun Bennett 63b3621ae3 Fix treasure open chest bug, added some animation touches 2014-09-15 13:34:21 -05:00
MrTwiggy abea4223ab Recommit up-time checking to prevent brand new empty servers from being prematurely killed by ServerMonitor. 2014-09-15 13:22:11 -04:00
Shaun Bennett 7c18e89249 Send chest open packets for new players that join in the middle of a treasure 2014-09-15 10:37:40 -05:00
Jonathan Williams c7e0ebefd1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-13 20:52:13 -10:00
Jonathan Williams a395cae764 Fixes for Custom tag
Fix for Bridge time
Fix for tournament auto whitelist.
Added UI stuf for tourney

Added build files for arcade.
2014-09-13 20:50:27 -10:00
Shaun Bennett 8659422877 Merge remote-tracking branch 'origin/master' 2014-09-14 00:29:37 -05:00
Shaun Bennett c1bc9fca2e Small treasure tweaks 2014-09-14 00:29:30 -05:00
Chiss 26a51f4ef2 Re-allowed opening of chests (for GUIs) during games. 2014-09-14 15:28:43 +10:00
Chiss f3df86a5a9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-14 14:10:51 +10:00
Chiss 7e3b9b4b3a some 1.8 title stuff 2014-09-14 14:10:40 +10:00
Shaun Bennett fc44592edf Merge remote-tracking branch 'origin/master' 2014-09-13 23:07:21 -05:00
Shaun Bennett 228cca4805 fix bug with reward amounts 2014-09-13 23:07:15 -05:00
Jonathan Williams 7ad7dd939d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-12 22:00:18 -10:00
Jonathan Williams 1c3326333d Fix for crash. 2014-09-12 21:59:12 -10:00
Jonathan Williams 4f5430e390 Added tournament stuff. 2014-09-12 21:52:44 -10:00
Chiss e31ab1b37a disabled treasure again! 2014-09-13 16:44:51 +10:00
Chiss 054709a859 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
2014-09-13 16:44:11 +10:00
Chiss 31c4a95da5 Disabled Treasure Chests 2014-09-13 16:43:18 +10:00
Shaun Bennett 1e7ed8d491 Treasure rewards + some minor fixes 2014-09-13 01:25:14 -05:00
Jonathan Williams a196e43fde Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
2014-09-12 19:46:19 -10:00
Shaun Bennett 0afb0f061c Changes to fireworks animation 2014-09-12 23:43:38 -05:00
Shaun Bennett aafdc555b1 Oops, accidentally removed some code! 2014-09-12 23:41:50 -05:00
Shaun Bennett 0f44850367 Treasure stuff 2014-09-12 23:30:00 -05:00
Shaun Bennett 5e9cbcef75 Merge remote-tracking branch 'origin/master' 2014-09-12 23:15:58 -05:00
Shaun Bennett 71f42c6e7b Treasure updates 2014-09-12 23:15:53 -05:00
Chiss a31e20d709 treasure styles 2014-09-13 14:09:50 +10:00
Chiss 4454627b32 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-13 13:41:48 +10:00
Chiss e511df4605 Merge treasure 2014-09-13 13:41:37 +10:00
Shaun Bennett fc6a2633c9 Remove debug message, make sure player is far enough from spawn to open treasure 2014-09-12 22:41:10 -05:00
Shaun Bennett 88ef0ce35b Merge remote-tracking branch 'origin/master' 2014-09-12 22:33:28 -05:00
Shaun Bennett a8eeef02dd Adjustments to how treasure rewards are selected 2014-09-12 22:33:22 -05:00
Chiss e36f843feb Fixed bug in MineStrike 2014-09-13 12:29:35 +10:00
Chiss f0fa3469df Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-13 09:17:50 +10:00