Ty Sayers
227a077dba
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
2015-08-29 15:53:42 -07:00
Ty Sayers
197309b914
Commit left-over changes to merge and pull.
2015-08-29 15:44:29 -07:00
Shaun Bennett
5db4a55dda
Enable clans login manager
2015-08-29 15:41:37 -07:00
Shaun Bennett
16b317a877
Forgot to remove debug code
2015-08-29 15:17:03 -07:00
Shaun Bennett
9ad39c1fe7
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-29 15:09:08 -07:00
Shaun Bennett
4aee4f8fd7
Fix generators
2015-08-29 15:09:02 -07:00
libraryaddict
6ae801314c
Fix spawning
2015-08-29 15:07:51 -07:00
libraryaddict
9a1469f6b0
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-08-29 15:03:32 -07:00
libraryaddict
5030ae7d57
For Chiss, may the code never break.
2015-08-29 15:03:22 -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
Shaun Bennett
5b534313f5
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-29 14:37:43 -07:00
Shaun Bennett
8f1da698d2
TNT generator storage in mysql (needs testing still)
2015-08-29 14:37:35 -07:00
Mini-Chiss
eb6a0c9e38
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-08-29 14:27:54 -07:00
Mini-Chiss
efd435396f
snake
2015-08-29 14:27:40 -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
Ty Sayers
35c79804ac
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-28 14:17:22 -07:00
Ty Sayers
825dd66283
Fix bug where certain chunks around Fields could not have blocks broken but could have blocks placed. Add a particle effect to combat tagged players in safe zones. Restructure Spawn claiming so that the center chunk is a Safe Zone and all other chunks are regular non-safe zones.
2015-08-28 14:17:11 -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
