4aee4f8fd7
Fix generators
2015-08-29 15:09:02 -07:00
6ae801314c
Fix spawning
2015-08-29 15:07:51 -07:00
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
5030ae7d57
For Chiss, may the code never break.
2015-08-29 15:03:22 -07:00
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
5b534313f5
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-29 14:37:43 -07:00
8f1da698d2
TNT generator storage in mysql (needs testing still)
2015-08-29 14:37:35 -07:00
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
efd435396f
snake
2015-08-29 14:27:40 -07:00
16d807db2e
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-29 14:01:45 -07:00
62cf58bd55
Fix a bug where claiming a new land would display that land as neutral
2015-08-29 13:56:26 -07:00
f0f9a4c674
Push it like a pushy pushy lady.
2015-08-29 13:46:09 -07:00
b7b81ecaaa
snake
2015-08-29 13:38:40 -07:00
fae27df496
Add ClansLoginManager, TNT Generators (Still needs persistence)
2015-08-29 13:35:31 -07:00
d2bc4b8cb4
SNAAAKE
2015-08-29 13:13:04 -07:00
5d28509474
Snakes tail final location instead of rel movement
2015-08-29 12:38:19 -07:00
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
7cd98c82e9
Refactor and move BossAbiliy
2015-08-29 12:06:57 -07:00
e7f861a6c2
Push golem changes, snakes code and rename bossability thingy
2015-08-29 12:04:53 -07:00
676817601a
Prevent players from logging into the wrong clans server
2015-08-28 17:31:09 -07:00
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
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
c51a449df3
Enable caching for clans, update craftbukkit jar
2015-08-28 13:10:30 -07:00
6f39c072a4
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-28 12:57:13 -07:00
7761ca7e6f
Remove debug messages
2015-08-28 12:56:43 -07:00
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
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
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
1f5cd624a4
Fix up iron golem, add slam attack
2015-08-28 11:42:33 -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
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
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
4ddc82f820
Fix 1.8 tablists bug by modifying Craftbukkit file PacketPlayOutPlayerInfo.class
2015-08-27 14:54:56 -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
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
e86bca99fd
Clans Chat
2015-08-27 14:33:50 -07:00
9d3f125c9e
Iron Wizard, fixed iron golem custom name
2015-08-27 14:18:10 -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
102fcd8e73
Push golem block shot as per request
2015-08-27 11:10:17 -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
062328313e
Fix errors
2015-08-24 22:24:26 -05: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
ba41118da7
Load boss battles properly
2015-08-25 01:58:57 +12:00
8798244351
Bosses stuff
2015-08-24 08:34:29 +12: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
81f793d693
Iron Wizard: Commit progress
2015-08-14 20:49:17 +12:00
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
7fb85f24d1
UtilEnt: Change CreatureLook to support LivingEntity, not just Creature
2015-08-14 19:15:35 +12:00
33a6e4cb13
UtilEnt: Add CreatureLook method
2015-08-14 19:12:05 +12:00
a2d7aa77fe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-14 00:37:55 -05:00
f5d934fe53
Fixed sync db calls for pets.
...
Make sure to add/remove pets in mysql.
2015-08-14 00:37:43 -05:00
80588a308b
balanaced brawler
2015-08-13 21:03:48 +02:00
7157aaee2b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-13 20:56:20 +02:00
a1ba2cffac
fixed needler not doing posion
2015-08-13 20:56:02 +02:00
0b4dbab871
Change ticket command access to admin
2015-08-13 11:23:29 -05:00
bd7317cf7b
Fix ticket command rollback >:D
2015-08-13 11:03:12 -05:00
5fa9135b08
renamed soccer to slimeball :)
2015-08-13 14:11:22 +02:00
6ef3215516
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-13 13:25:41 +02:00
534c91c706
remove items from inside soccer
2015-08-13 13:24:55 +02:00
bc8aff31cb
Merge remote-tracking branch 'origin/master'
2015-08-13 06:12:24 -05:00
af15476f19
Use login query to handle logins
2015-08-13 06:12:11 -05:00
878ac82ade
fixed error!
2015-08-13 13:01:41 +02:00
1487692609
completely disabled team armor in arcade. avoids typing it just as game starts.
2015-08-13 12:57:30 +02:00
fc1a8e4e25
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-13 12:52:11 +02:00
f3b58fe9b6
disabled team armor command in games D:
2015-08-13 12:51:57 +02:00
e1d04354fb
Use dummy record for AddPlayer
2015-08-13 05:18:53 -05:00
94c00cdb72
Adding some comments
2015-08-13 04:05:28 -05:00
4d6e827739
Remove vote3!
2015-08-13 04:03:03 -05:00
92c0e1452b
Add vote3
2015-08-13 04:01:53 -05:00
0c68321e81
Global button
2015-08-13 03:58:05 -05:00
11a4805c38
Stat stuff!
2015-08-13 03:54:23 -05:00
4aac057956
Merge remote-tracking branch 'origin/master'
2015-08-13 03:32:40 -05:00
05b1b91686
Carl!
2015-08-13 03:32:31 -05:00
8476578bc0
Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324':
Various Fixes.
2015-08-13 01:52:16 -05:00
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
0ff7cee229
Merge pull request #32 in MIN/mineplex from Alex_MILKCOW to master
...
* commit 'cc24bb78d3968c0c364164fb43e19724007e3833':
Fixed Cows being able to fly if they had the Rabbit Farmer kit
Fixed new classes not appearing in repository
Milk The Cow: New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost
2015-08-13 01:45:56 -05:00
Shaun Bennett
libraryaddict
Ty Sayers
Mini-Chiss
Ty Sayers
libraryaddict
Jonathan Williams