Commit Graph

4092 Commits

Author SHA1 Message Date
Shaun Bennett 8f1da698d2 TNT generator storage in mysql (needs testing still) 2015-08-29 14:37:35 -07:00
Shaun Bennett 16d807db2e Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-29 14:01:45 -07:00
Shaun Bennett 62cf58bd55 Fix a bug where claiming a new land would display that land as neutral 2015-08-29 13:56:26 -07:00
libraryaddict f0f9a4c674 Push it like a pushy pushy lady. 2015-08-29 13:46:09 -07:00
Mini-Chiss b7b81ecaaa snake 2015-08-29 13:38:40 -07:00
Shaun Bennett fae27df496 Add ClansLoginManager, TNT Generators (Still needs persistence) 2015-08-29 13:35:31 -07:00
Mini-Chiss d2bc4b8cb4 SNAAAKE 2015-08-29 13:13:04 -07:00
libraryaddict 5d28509474 Snakes tail final location instead of rel movement 2015-08-29 12:38:19 -07:00
libraryaddict bd2fda17b0 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-08-29 12:07:23 -07:00
libraryaddict 7cd98c82e9 Refactor and move BossAbiliy 2015-08-29 12:06:57 -07:00
libraryaddict e7f861a6c2 Push golem changes, snakes code and rename bossability thingy 2015-08-29 12:04:53 -07:00
Shaun Bennett 676817601a Prevent players from logging into the wrong clans server 2015-08-28 17:31:09 -07:00
Shaun Bennett c51a449df3 Enable caching for clans, update craftbukkit jar 2015-08-28 13:10:30 -07:00
Shaun Bennett 6f39c072a4 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-28 12:57:13 -07:00
Shaun Bennett 7761ca7e6f Remove debug messages 2015-08-28 12:56:43 -07:00
Ty Sayers c53963448e Merge pull request #47 in MIN/mineplex from clans_custom_gear to clans-beta
* commit '5cdf31d0e6bbc2074c12ce270f995301b5184c45':
  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 14:53:03 -05:00
Ty Sayers 5cdf31d0e6 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-28 12:52:12 -07:00
Ty Sayers 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
Shaun Bennett cd145324d8 Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit 2015-08-28 12:00:23 -07:00
libraryaddict 249ecdd381 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta 2015-08-28 11:42:53 -07:00
libraryaddict 1f5cd624a4 Fix up iron golem, add slam attack 2015-08-28 11:42:33 -07:00
Ty Sayers 8b105a0b22 Merge pull request #46 in MIN/mineplex from clans_custom_gear to clans-beta
* commit '268cced9f2ff058485c70d611dc46d2159750b47':
  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 17:48:12 -05:00
Ty Sayers 268cced9f2 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-27 15:47:26 -07:00
Ty Sayers 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
Ty Sayers 2e4c27cb11 Merge pull request #45 in MIN/mineplex from clans_custom_gear to clans-beta
* commit '4ddc82f8204e322373b54c50308dc6bdb29f59b3':
  Fix 1.8 tablists bug by modifying Craftbukkit file PacketPlayOutPlayerInfo.class
2015-08-27 16:56:41 -05:00
Ty Sayers ff13f51151 Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 2015-08-27 14:55:33 -07:00
Ty Sayers 4ddc82f820 Fix 1.8 tablists bug by modifying Craftbukkit file PacketPlayOutPlayerInfo.class 2015-08-27 14:54:56 -07:00
Shaun Bennett 4f2d861b21 Fix chat bug, enable TablistFix for clans 2015-08-27 14:53:52 -07:00
Ty Sayers 4567496978 Merge pull request #44 in MIN/mineplex from clans_custom_gear to clans-beta
* commit '783f526b76266cf4b947ff6b6530c73b2e1c2366':
  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 16:44:03 -05:00
Ty Sayers 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
Ty Sayers 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
libraryaddict 379ee9271a Merge pull request #43 in MIN/mineplex from clans/world-events to clans-beta
* commit '9d3f125c9eb1139e6d5cfbdbe63158161e6a488b':
  Iron Wizard, fixed iron golem custom name
  Push golem block shot as per request
2015-08-27 16:34:46 -05:00
Shaun Bennett e86bca99fd Clans Chat 2015-08-27 14:33:50 -07:00
libraryaddict 9d3f125c9e Iron Wizard, fixed iron golem custom name 2015-08-27 14:18:10 -07:00
Shaun Bennett 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
libraryaddict 102fcd8e73 Push golem block shot as per request 2015-08-27 11:10:17 -07:00
Shaun Bennett 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
Shaun Bennett a5400b0fef Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-08-26 18:35:20 -07:00
Ty Sayers 6442ec4c2a Merge pull request #42 in MIN/mineplex from clans_custom_gear to clans-beta
* commit 'c20d2c9516a04927b45686f301e0ea75050549e6':
  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.
  Left-over commit from last update to add new /region-reset command.
  Add new /region-reset command to reset and re-claim all admin-based regions such as Spawn, Shops, Borderlands, and Fields.
  Increase spawn safe-zone radius by one chunk and shift east shop location one chunk over to fit with the map.
  Fix bug where NPCs were unable to spawn into safe zones. Remove Shield Smash skill from Clans.
2015-08-26 19:38:58 -05:00
Ty Sayers 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
Shaun Bennett 669de4c91d Change EntitySpawnEvent to CreatureSpawnEvent 2015-08-26 16:44:39 -07:00
Shaun Bennett e4c48e5f3f Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta 2015-08-26 15:01:44 -07:00
Shaun Bennett e85682d68f Use proper item names for recipes, don't allow repairing items more than two times 2015-08-26 14:56:28 -07:00
Ty Sayers 62ffdc1ef1 Left-over commit from last update to add new /region-reset command. 2015-08-26 14:54:33 -07:00
Ty Sayers 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
Shaun Bennett 0dd79419eb Update schematic files 2015-08-26 13:39:13 -07:00
Shaun Bennett e6c4227a4f Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta 2015-08-26 13:30:02 -07:00
Ty Sayers 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
Ty Sayers 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
Shaun Bennett 14f5cb4704 Allow breaking/placing blocks when in creative 2015-08-26 13:09:01 -07:00