6f39c072a4
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-28 12:57:13 -07:00
b98cde8b80
Fix bug where players couldn't move items in their inventory to sell gold tokens to shop. Reduce knockback amount on HeavyArrow skill for Ranger class. Prevent players who do not have the Ranger or Assassin class from being able to shoot bows. Add notification message on Smelting feature to reduce confusion among players. Fix bug with Building shop where the listed sell price and actual sell price weren't synced properly. Fix bug with all shops where purchasing items in bulk failed.
2015-08-28 12:52:02 -07:00
cd145324d8
Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit
2015-08-28 12:00:23 -07:00
6a330a66d9
Fix bug with Building shop materials not properly being purchased in bulk. Modify the notification message for combat tagged players in safezones to display on the middle of the screen instead of chat.
2015-08-27 15:46:57 -07:00
4f2d861b21
Fix chat bug, enable TablistFix for clans
2015-08-27 14:53:52 -07:00
783f526b76
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-27 14:42:41 -07:00
4dcd54a9b0
Fix bug with DisguiseManager not properly handling the undisguising of non-player entities. Fix bug where FleshHook skill could be activated on players in a safe zone. Fix multiple bugs with unsafe logging system and NPC drops. Fix bug where unsafe timers and combat tagging in safe zones was not properly functioning. Fix bug with CustomGear not properly spawning with command. Add Clan Blacklist that restricts naming of Clans.
2015-08-27 14:42:07 -07:00
e86bca99fd
Clans Chat
2015-08-27 14:33:50 -07:00
b0ee2bb669
Fix purple/black item bug, fix clans/ally chat bug with no clan, murder changes, drop player gold as items on death, add lore to crafted items
2015-08-27 13:57:57 -07:00
adfc451e9f
You can only repair items two times, ClansAdmin commands now require admin, Fix durability bug, Fix potion effects making inventory shift
2015-08-27 09:33:44 -07:00
a5400b0fef
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-26 18:35:20 -07:00
c20d2c9516
Fix bug with economy gold additions/reductions not properly working and causing shops to fail. Fix bug with region resetting command and streamline the claiming of server-based faction chunks for Spawn, Shops, Fields and Borderlands.
2015-08-26 17:37:31 -07:00
669de4c91d
Change EntitySpawnEvent to CreatureSpawnEvent
2015-08-26 16:44:39 -07:00
e4c48e5f3f
Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta
2015-08-26 15:01:44 -07:00
e85682d68f
Use proper item names for recipes, don't allow repairing items more than two times
2015-08-26 14:56:28 -07:00
62ffdc1ef1
Left-over commit from last update to add new /region-reset command.
2015-08-26 14:54:33 -07:00
3b999d2660
Add new /region-reset command to reset and re-claim all admin-based regions such as Spawn, Shops, Borderlands, and Fields.
2015-08-26 14:54:15 -07:00
0dd79419eb
Update schematic files
2015-08-26 13:39:13 -07:00
e6c4227a4f
Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta
2015-08-26 13:30:02 -07:00
fc5f57803e
Increase spawn safe-zone radius by one chunk and shift east shop location one chunk over to fit with the map.
2015-08-26 13:29:22 -07:00
c3013063de
Fix bug where NPCs were unable to spawn into safe zones. Remove Shield Smash skill from Clans.
2015-08-26 13:09:10 -07:00
14f5cb4704
Allow breaking/placing blocks when in creative
2015-08-26 13:09:01 -07:00
7a66a8dad9
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-26 12:26:35 -07:00
b13c9fe227
Field updates, War updates, bug fixes
2015-08-26 12:26:27 -07:00
52911b9534
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-26 12:24:02 -07:00
9a45d1116a
Fix bug with players being able to pick up water and lava sources with empty buckets. Fix bug where death animation wasn't properly playing on entities that entered a safe zone. Increase hunger decay rate slightly. Swap the locations for Shop and Spawn zones and fix appropriate radius differences for zones.
2015-08-26 12:22:36 -07:00
bf1f62057c
Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta
...
Conflicts:
Plugins/.idea/misc.xml
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2015-08-24 22:15:08 -05:00
6841cbac69
Clans bug fixes + shop updates
2015-08-24 22:03:26 -05:00
69afefd66f
Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java
Additionally, fix bug where players could fish hook to combat-tag a player in spawn and then attack them. Fix issue where players were able to empty lava and water buckets. Fix bug where monsters wandered into and around spawn zones. Fix bugs where special abilities FireBlast, ExplosiveShot, and WolfsPounce were not affecting mobs (only players). Fix bug with soup left-click punch activation not fully integrated.
2015-08-24 20:55:29 -04:00
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
6c9a99fa1b
Fix soup consumption bug that didn't allow left clicking for use. Fix bug with item frames being destroyed inside spawn zones. Fix bug with bow deficient classes not properly receiving damage reductions on their bow attacks. Fix bug with Whirlwind Axe skill being enabled in Clans settings. Fix bug where bank related shop buttons functioned as gold token purchasables for error-displaying icons. Increasing duration on potion application from custom gear to prevent shaking inventory screen. Fix bug with gold balance changes (add/remove) weren't taking place synchronously, leading to the ability for duplication of gold and items. Fix bug where enemy'd Clans could be allied or neutral'd, as well as signaling that at-war clans were neutral. Fix bug where clans could unclaim admin chunks and ally chunks. Decrease the rate at which hunger decreases to be more accordance with 1.6 food systems. Disable Flint & Steel, Enderpearls, and Witch spawning.
2015-08-22 15:06:05 -04:00
39ede2064a
Bosses game progress
2015-08-21 16:12:26 +12:00
1e14d29999
Clans: Migrate bosses to combat core, fix map to rotate its cursor, finished golem?
2015-08-17 21:04:26 +12:00
7a7543886f
fixed a ton of commands NPEing on no args
2015-08-17 09:04:39 +02:00
81f793d693
Iron Wizard: Commit progress
2015-08-14 20:49:17 +12:00
2305e8bbaa
Store Kills, Deaths, Murders, Wins, Losses in database
...
Add Murder
2015-07-29 01:48:49 -05:00
13f47ad903
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/CustomItem.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
2015-07-24 13:59:01 -05:00
0b49d053fe
Fix memory leak in player gear management. Update custom gear display design for title and description to fit CJ's specified design, as well as updating attribute descriptions to match google doc more closely. Fix bug with damage reduction attributes adding instead of reducing damage. Fix bug with parse errors causing defective attribute bugs and console spam with certain custom gear attributes. Fix bug where legend was not being properly displayed for /c map command. Fix bug where chunks could be claimed diagonally to opposing enemy clans. Fix bug with redstone not properly being disabled. Fix bug with attribute effects taking place even when damage events were cancelled, such as in safe zones. Fix bug with dispensers being able to place lava and water blocks. Fix bug where holding a book caused debug chat spam for players in regards to custom damage events.
2015-07-20 15:57:57 -05:00
cd55eba2be
Clans: Fix map inventory moving
2015-07-21 07:37:08 +12:00
0772f2e91e
Fixes for GoldManager
2015-07-19 21:04:59 -07:00
3b47b01aea
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-07-19 20:18:08 -07:00
73aea85876
GoldManager now uses stored procedure.
...
Deductions automatically process gold queue and return if transaction succeeded.
2015-07-19 19:32:46 -07:00
3660b348cd
Work on Gold.
2015-07-19 18:15:50 -07:00
1ef6fe3ed6
Observer changes
2015-07-17 15:37:33 -05:00
3dcf489ea6
Add 'clan' to the clans command
2015-07-17 17:12:44 +12:00
2b2e5e5c97
Spelling fixes + Observer mode
2015-07-16 15:51:21 -05:00
c79117f86a
Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
2015-07-17 00:30:54 +12:00
aaee5f01ce
Clans: Modifications to map stuff, fix food level depleting too fast
2015-07-17 00:30:34 +12:00
9cf4ff005a
Added some debug checks.
2015-07-16 01:26:38 -05:00
6a598690b0
Jooq Update, Async Clans calls, Clan name in scoreboard, block toss fix
2015-07-15 21:43:35 -05:00
7f98157890
More work/fixes
2015-07-14 20:38:30 -05:00
ae71de30db
Fixes and changes
2015-07-14 01:57:53 -05:00
5c5e7dd4a9
Merge master into clans
2015-07-13 20:42:10 -05:00
231d4bd494
Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events
2015-07-13 20:23:51 -05:00
dc1fe5fc2c
Fix schematic material id bug, add new schematics from build team, fix field ore bug, make /gear admin+, enable server join for staff ranks, remove annoying log spam from VisibilityManager
2015-07-13 19:11:17 -05:00
66bef4ac00
Maps: 100 deaths before maps freeze, sends a warning message when switching servers from clans
2015-07-13 21:21:17 +12:00
a9e68ff777
Completed Energy
2015-07-08 21:39:31 -05:00
27c7e7be03
Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
2015-07-04 09:07:29 +12:00
fbf2935b19
Don't display dead players
2015-07-04 09:07:14 +12:00
384d1814d7
Scoreboard teams display clan relationships
2015-07-03 15:12:46 -05:00
c021c6cc19
Added missing but not forgotten MapCommand
2015-07-04 07:12:50 +12:00
24294237ea
Add /map command
2015-07-04 04:11:35 +12:00
89a4541275
If inventory is empty, add clans map
2015-07-04 04:09:18 +12:00
c75f22b5e0
Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2015-07-04 03:44:59 +12:00
68f7bd533d
Clans Map stuff
2015-07-03 14:23:37 +12:00
9ccc85a79e
Improved block restore for Events
2015-06-30 22:30:49 -05:00
0fce46f504
Finished Undead Camp Event (Loot tables still need adjusting)
2015-06-30 15:28:50 -05:00
0fdc4e0008
Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/event/undead/UndeadCamp.java
2015-06-30 14:04:35 -05:00
be974bfaac
Work from laptop
2015-06-30 14:02:39 -05:00
e0284e2eb0
Loot for World Events
2015-06-29 22:32:40 -05:00
d2f633f572
Fix attribute name positioning bug as well as duplicated attributes on randomly generated items. Fix misleading description of item attributes Conquering/Protection. Fix bug with unwanted entities spawning and targetting players in safe Spawn zones. Fix bug with WindBlade occasionally killing users via fall damage after a long flight even though close to the ground. Fix bug with MagneticBlade not properly pulling entities other than players. Fix bug with AlligatorsTooth not properly granting certain effects such as water breathing.
2015-06-29 16:38:51 -04:00
d07c319581
Saving some work
2015-06-27 22:22:02 -05:00
1865e41144
Undead Camp
2015-06-26 01:05:36 -05:00
7f530f6593
New border dimensions
2015-06-24 23:18:18 -05:00
a0d97d5d99
Scoreboard changes, Fix region values, add 1.8 Border for map
2015-06-24 22:44:41 -05:00
2735c81205
Fix bug with leaving and joining clans: online player list wouldnt update
2015-06-23 23:00:07 -05:00
fa612c9c86
Chat filter clan names, Fix scoreboard bug
2015-06-23 22:48:51 -05:00
935aba9c16
Some world event tweaks, refactor clans and clanTerritory to use new clanServer table with serverId, updated jooq classes
2015-06-23 21:45:55 -05:00
e34324b864
Disable auto event now while location and abilities are tweaked
2015-06-23 17:05:47 -05:00
76a1f2b1f0
Reset timer when no players are online
2015-06-23 16:37:49 -05:00
009f8a6764
Merge with twiggy
2015-06-23 16:36:21 -05:00
50ddd23251
Event auto starting, Terrain Finder, Scoreboard Tweaks, Event idle, other random tweaks
2015-06-22 20:34:13 -05:00
1541dc329e
Merge branch 'clans/test-server' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java
2015-06-22 16:24:31 -04:00
2ffe2badf2
Reimplement clan energy-draining over time. Add combat-logging NPC for players that prematurely log off. Fix bug regarding /logout command for safe-logging. Reduce Shop territory side by 1 chunk radius. Add organic farming shop for purchasing/selling farm produce. Add travel hub for transporting between different spawn and shop locations. Add missing BowAttributes implementations for custom bows, and re-add in probability for dropping bows on custom gear drops. Fix bug related to custom-bow items not properly formatting item descriptions and display name. Update Redis default host IP. Fix bug where ranged attacks triggered melee-based custom gear attributes. Add clan management command for managing/deleting clans during testing phase of alpha/beta Clans.
2015-06-22 16:20:20 -04:00
03c45116ef
Various fixes, and added the new data to Zoologist kit
2015-06-21 23:38:25 -04:00
dd9e6a6866
Started adding SkyWars game mechanics
2015-06-18 14:54:26 -04:00
71da87a5ae
Some cleanup
2015-06-17 21:36:47 -05:00
b5f4574b1b
Show region on scoreboard, moving on to event finishes
2015-06-17 20:37:45 -05:00
dbdb2b3fc5
Scoreboards and WorldEvent work
2015-06-17 17:40:16 -05:00
8245b6c466
Schematic generation over time, fixes to gold manager drops
2015-06-14 17:30:02 -05:00
d24f01ba86
More event stuff!
2015-06-11 23:35:29 -05:00
9cdf69b19d
More work on events
2015-06-09 22:58:52 -05:00
4dd1cf43de
Add ability to convert Gems into Gold daily to Bank Shop, including redis-based system for tracking most recent transfers. Fix bug with item attributes that reference potions not properly displaying potion value effects (uses roman numerals). Prepare for custom textured Legendary items by modifying over to record-based materials. Add base for organic produce / farming shop.
2015-06-09 15:46:38 -04:00
d1a7d16810
Fixes GoldManager
2015-06-08 15:04:30 -05:00
6a0584d419
Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans/world-events
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java
2015-06-08 15:03:51 -05:00
aa9aba92cd
Commit for merge
2015-06-08 14:59:06 -05:00
8c7faf27dd
Store gold drop amounts in item metadata (might be worth switching to our own storage?)
2015-06-06 16:04:11 -05:00
24a1016836
Slime enrage
2015-06-06 15:39:51 -05:00
6ea000fd22
Remove slimes when server stops
2015-06-06 15:16:03 -05:00
1f92564ea1
Changes to Slime Boss, ability to drop gold with GoldManager, small KOTH changes. [ALL UNTESTED]
2015-06-06 14:49:41 -05:00
971612a538
Fix bug relating to Energy Shop purchases and item functionality. Fix bug with GoldManager not being properly initialized on plugin start-up. Add Shops safe-zone to region claims for default clans across world. Create BankShop for all interactions related to economy management, specifically buying & selling GoldTokens as well as converting Gems into Gold on a daily basis.
2015-06-05 19:18:06 -04:00
90a7362440
Marge with twiggys code, work on slime splitting
2015-06-04 00:21:09 -05:00
fa3e6c3d1f
Fix bug with multiple locations being used for claiming separate areas for server-side clans such as Spawn.
2015-06-03 20:10:32 -04:00
e15a2ad123
Add ClansRegions to handle the initialization of default server-side Clans representing special territories such as Spawn and Fields. Additionally, claim land with appropriate distribution according to the respective Clan. Fix bug with WeightSet generation not properly handling low amounts of uniformly likely elements. Fix bug with ClanInfo not properly handling creation of clans and initializing the date created field. Fix bug with Spawn region not properly protecting from claim and PvP settings.
2015-06-03 20:08:34 -04:00
d8acb0aae6
Merge remote-tracking branch 'origin/clans_custom_gear' into clans/world-events
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2015-06-02 20:45:53 -05:00
5d431a586a
King of the hill work
2015-06-02 20:44:14 -05:00
1fa919e954
Finish GoldToken integration for cashing in. Re-implement fixed hidden JSON lore encoding. Fix damage reduction attributes where entity types weren't being properly initialized. Prevent players from breaking blocks in temporary Spawn regions.
2015-06-02 20:01:42 -04:00
155b078c49
Update spigot version to Shaun's changed. Add separate spawn locations at (200,0) and (-200,0) on the map as well as safe-zone regions surrounding spawns. Temporary halt energy deduction until energy shop is enabled. Fixed issues related to field zones being claimable/breakable, as well as borderlands. Define claimable areas. Add GoldToken item for storing currency into physical items. Add gold management for checking economic status for players.
2015-06-01 15:51:22 -04:00
2e19aabfa1
Convert damage system to custom Mineplex damage events to enable legendary abilities. Fix NPE and hanging issue on ServerData's serialization adapter. Finalize item generation logic for instantiating CustomItem's based on specified random distribution of types, attribute counts, etc. Fix several Legendary bugs discovered during testing. Clean left-over template documentation and further clarify ambiguous methods. Add proper updating logic for custom items to track internal stats in hidden json lore. Add safe-logout system to prevent combat logging and enable players to safely log after a designated amount of time. Tweak WindBlade's flight speed to a more natural value.
2015-06-01 12:25:20 -04:00
68b708e32e
Schematic Utilities for Clans
2015-05-29 18:23:46 -05:00
dc994956e1
[Clans] Slime absorb work
2015-05-28 18:56:03 -05:00
6b10d9f3c9
[Clans] More work on world events
2015-05-28 15:20:43 -05:00
167549c9e8
Add implementation for variety of attribute and base attribute hierarchies, add in JSON encoding for itemstack-item pairing to hold stats and information about items without unintuitive print & parse methods. Temporarily disable donation related commands in DonationManager for testing, as it was presenting compilation issues. Introduce further implementation of LegendaryItems. Add various utility methods for JSON encoding (utilizes GSON). Fix various bugs seen in internal testing.
2015-05-25 14:22:06 -04:00
20fadcd187
[Clans] Work on world events/slime boss
2015-05-24 01:37:16 -05:00
ff377a3e5c
[Clans] World event state system
2015-05-21 15:33:02 -05:00
a8a8d4961a
Add remaining bow and armor based attributes, include base implementation of Legendary weapons. Fix smelting bug.
2015-05-16 12:58:58 -04:00
643ed2c047
Fixed most enchants not working
...
added commands to event
minor update to snowfight to make it more fun
2015-05-11 19:55:26 -05:00
6b3028605e
Merge branch 'master' into clans_custom_gear
2015-05-05 15:58:03 -04:00
66c9fefc6e
Add leftover Clans commit to introduce GearManager.
2015-05-05 15:34:32 -04:00
7567648312
Add CustomItem hierarchy for Clans project, introducing rare gear that can be decorated with various ItemAttributes for unique effects.
2015-05-05 15:33:42 -04:00
244ffece8a
Fixes for build game + fix clans compile
2015-05-01 18:02:06 -05:00
4ac4e9d729
Start of world event framework
2015-04-30 13:15:20 -05:00
50c38dc467
April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA
2015-03-31 17:22:50 -04:00
98b14c9c7e
Fixed Clans repository so it uses the pool.
2015-03-11 19:20:42 -07:00
626bfc35fc
Revert "Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections.""
...
This reverts commit 215ec7b00d
2015-03-11 18:05:13 -07:00
215ec7b00d
Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections."
...
This reverts commit adfe5fb74e
2015-03-07 19:38:06 -05:00
adfe5fb74e
Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections.
2015-03-07 19:36:54 -05:00
5e78b43860
Added StaffOnly code to ServerConfiguration
2015-03-02 12:33:04 -08:00
90ebbd9962
More refactors
2015-02-27 22:53:55 -05:00
efce714375
DEVP-66 Refactor commonly used classes to Java conventions
...
Refactoring + testing jira
2015-02-26 00:07:07 -05:00
6a368454ec
Clans database refactoring
2015-02-18 21:31:38 -05:00
aebe390c3c
Refactored ClanRole enum
2015-02-18 19:56:29 -05:00
fd0547d9d3
Added connection re-establishment to database calls if error occurs.
2015-02-14 22:50:52 -08:00
58eaaaa2ee
Treasure fixes
2015-02-10 21:15:44 -05:00
26463ba75d
Treasure changes :O
2015-02-09 20:24:20 +13:00
f8885e4c5c
Merge remote-tracking branch 'origin/master'
2015-02-05 21:36:19 -05:00
d878e3940e
War state, handle time better, ability to have a server timezone (see ClanManager)
2015-02-05 21:36:07 -05:00
dbd6f449eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
2015-02-05 11:37:35 +11:00
c7d4b14f4c
Revert "Revert "Work on treasure............""
...
This reverts commit 49bfe385bf
2015-02-05 11:34:29 +11:00
0f23533f41
Fix typos in EnemyData
2015-02-03 23:18:42 -05:00
2060b74343
War death handling, more war logic, other fixes
2015-02-03 19:35:53 -05:00
b0be5b2510
Time code for war, server time command
2015-02-03 16:48:26 -05:00
3b324448b5
Fix errors in war manager
2015-02-03 14:19:22 -05:00
939c6189a7
Merge energy and war with master
2015-02-03 14:16:07 -05:00
bb197ff629
Merge War and Energy
2015-02-03 14:14:52 -05:00
b0a2e655c1
Changes to IntellIJ Files
2015-02-03 14:12:52 -05:00
6cefeb1b74
More work on War
2015-02-03 14:02:45 -05:00
49bfe385bf
Revert "Work on treasure............"
...
This reverts commit 50a8fb03a9
2015-01-29 22:28:41 -08:00
1cc0879ce9
treasure stuff
2015-01-29 22:17:46 -05:00
b92226a771
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-23 00:55:36 -08:00
08078c1622
Removed Logger
2015-01-22 23:18:38 -08:00
8bf64ec55c
Database and code implementation of enemies
2015-01-22 22:17:19 -05:00
882eb46479
Unclaiming land when you run out of energy
2015-01-22 21:32:10 -05:00
2bab4133b0
Fix ugly /gold command
2015-01-22 20:41:05 -05:00
a1f2a3a2a1
Clan Energy
2015-01-22 20:34:44 -05:00
8e04a2a5f2
Portal now checks server status and player's rank before sending them to a server to prevent login spam.
...
Refactored portal method names.
2015-01-11 00:42:31 -08:00
f0e3520343
Prevent inferior ranks to override actual ranks unless its Rank.ALL via Enjin
2014-12-29 08:02:14 -05:00
97f57b655b
Prevent horses from spawning in Clans
...
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
9b3350c8c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-22 09:22:50 -05:00
d920439ec5
Clans update. Laying groundwork for energy
2014-12-22 09:22:10 -05:00
679f7909b0
Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers
2014-12-18 12:45:56 +11:00
d19431a47f
Rename Clicked to onClick
2014-12-17 18:40:44 -06:00
1260e875fd
Add clans to intellij. Update button
2014-12-17 18:38:35 -06:00
6941c1c827
Added a few more items for BuildingShop in Clans.
2014-12-15 21:29:50 -05:00
5b67e2182a
Added disguise to Pet Manager for eventual wither disguised pet.
2014-12-14 02:30:39 -05:00
342c44affc
Fixed a bunch of clans bugs
2014-12-08 00:55:20 -08:00
60a46d5adf
Replaced Dwarf Toss with Block Toss in Clans.
2014-12-06 04:23:26 -08:00
3d3f9012ff
Added some base Clans shops.
...
Added support for Gold
Refactored failed db call code a bit.
2014-12-04 23:41:49 -08:00
59f93d46ec
Refactored IButton
...
Added ComplexButton
Added Clans farming.
Added Clans Recipes.
Added Clans gameplay.
Added shop files structure.
2014-12-04 05:05:27 -08:00
abaf9f4693
Refactored IRelation method names
...
Added support for negative amounts in Support server.
Clans in core testing state.
2014-12-03 13:06:50 -08:00
e7cf4eb51d
Removed use of Gem Boosters
...
Cleaned up some unused imports.
2014-12-01 02:27:39 -08:00
f507db7664
Reworked spawn to save to database.
...
Work on Clans:
Fixed clan loading/updating/adding.
Refactored some code for Clans.
2014-11-29 03:16:37 -08:00
92ea94c3be
Fixed creating clan delay in clans/ClientClan.java
...
Added logging for Mineplexer startup.
Fixed return generated keys in RepoBase
2014-11-28 14:06:41 -08:00
515176b63f
Clans to buildable state.
2014-11-27 22:34:20 -08:00
1198426d8d
Little more work on Clans.
2014-11-23 05:08:33 -08:00
1a6b80b08e
More work on clans..
...
Finished ClansDataAccessLayer
Finished ClansAdmin
Finished ClansDisplay
2014-11-19 22:24:36 -08:00
df76f6be10
More work on Clans.
2014-11-15 01:13:14 -08:00
4812da2cd9
More work on Clans - Clan repository.
2014-11-13 19:14:56 -08:00
1372f74921
Refactored some names in MiniPlugin
...
Work on clans.
2014-11-12 19:21:12 -08:00
8d62966abc
Created Clans project.
...
Converted Fields code complete (not tested).
2014-11-12 05:13:16 -08:00
Shaun Bennett
Ty Sayers
libraryaddict
Mini-Chiss
Shaun Bennett
Jonathan Williams
Jeremiah Bishop
CoderTim
Chiss