1bf8ccfc43
Bump worldevent required rank
2016-05-26 10:24:50 -05:00
9da9dce398
Fix mimic, allow chests and invite. Fixes PC-375
2016-05-24 16:40:25 -04:00
2991bec44d
Fix listener priorities (again). Fixes PC-370
2016-05-24 16:04:15 -04:00
2680c2b244
Don't apply attributes on friendlies. Fixes PC-369
2016-05-24 15:58:44 -04:00
9acdbd7cbe
Don't allow placing banners and string. Fixes PC-333
2016-05-24 15:38:03 -04:00
9853ef824e
QA Pass #2 - Comment WorldManager, optimize searching
2016-05-24 12:24:14 -05:00
b952de856e
Add a description for the Magnetic Maul and switch ConcurrentHashMap to HashMap in the Meridian Scepter
2016-05-24 13:15:29 -04:00
f32e648691
QA Pass #1
...
Remove potential main thread IO in ItemMapManager
Don't construct search string if limit is reached
Also cleaned up WorldManager to be more efficient
2016-05-24 13:15:29 -04:00
2f993dbe66
Fix Wind Blade, Hyper Axe
2016-05-24 13:15:29 -04:00
4ba3148df7
Finish invsee
2016-05-24 13:15:29 -04:00
ec0e1b9849
New invsee implementation
2016-05-24 13:15:29 -04:00
63e3cc8e12
Add nullcheck
2016-05-24 13:15:29 -04:00
d8b5dba3fc
Fix Meridian Scepter
2016-05-24 13:15:29 -04:00
1dc5a0d712
Revamped Meridian Scepter attack
2016-05-24 13:15:29 -04:00
981bed5e37
Limit clan searching. Fixes PC-331
2016-05-24 13:15:29 -04:00
e0f4c9cbc8
Update Broadsword regen
2016-05-24 13:15:29 -04:00
41846f835d
Bump listener priority, change wording. Fixes PC-308
2016-05-24 13:15:29 -04:00
c172d226c4
Add bypass for testing servers to skip tutorials
2016-05-24 13:15:29 -04:00
08784d3f0a
Ignore float kick for Wind Blade. Fixes PC-314
2016-05-24 13:15:29 -04:00
786c60537e
Remove /c trust from help. Fixes PC-280
2016-05-24 13:15:29 -04:00
cd0e59087a
Don't drop items from hidden slimes. Fixes PC-276
2016-05-24 13:15:29 -04:00
9141ed645a
Fix fissure anvil repair exploit. Fixes PC-312
2016-05-24 13:15:29 -04:00
ea43dca9af
Don't allow placing TNT in tutorial. Fixes PC-307
2016-05-24 13:15:29 -04:00
d29d5dd5e4
Actually fix PC-279
2016-05-24 13:15:29 -04:00
89da8790bf
Clans optimizations
...
Key notes:
* RAM usage decreased on startup
* Startup speed much quicker
* Map is entirely rendered on startup
Details:
Changed TutorialWorldManager Stack -> LinkedList because no need for
synchronization
Documented map methods and magic numbers
Remove loading all chunks on startup
Render map on startup
Optimize map rendering by replacing ArrayList with LinkedList
Optimize map rendering by reading chunk directly from disk and caching to
prevent entity ticking
Optimize map rendering by using a global BlockPosition
Save results for showing zoom
2016-05-24 13:15:29 -04:00
7c66c98338
Clean up Farming
2016-05-24 13:15:29 -04:00
173a6bb143
Delete IncognitoHidePlayerEvent
2016-05-24 13:15:29 -04:00
2675789f59
Compare commands with equals. Fixes PC-116
2016-05-24 13:15:29 -04:00
434ada2e86
Fix merge issues
2016-05-24 19:14:52 +10:00
ed68ef332b
Fixes for Win Room (Players were able to see other players)
...
Added command to allow other players to run ranked commands
Fixes code styles
2016-05-22 21:05:48 -03:00
35c7b9a2bd
Incognito Updates:
...
-ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish])
-ADD: Make it so /stats don't work on vanished staff.
-ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.
2016-05-17 18:10:07 -05:00
6042be2d2f
Refactor clans ban functionality and remove UtilStreams
2016-05-17 05:57:27 -05:00
f5cf751622
Revert "Temporarily disable clans ban functionality"
...
This reverts commit b47c49d93b
2016-05-17 05:51:18 -05:00
1fc4239b89
Determine whether Ice Prison target is valid. Fixes PC-281
2016-05-16 15:44:22 -05:00
de1fabf53d
Disable report system as it is not ready to go live
2016-05-09 02:10:51 -04:00
4aa44cd796
Merge branch 'develop' into clans/beta
2016-05-08 16:53:48 -05:00
b47c49d93b
Temporarily disable clans ban functionality
...
This can be reverted when clans bans are properly audited/fixed/tested.
2016-05-07 19:02:19 -05:00
38f22b1577
Disable obsidian dropping after breaking THE BLOCK
2016-05-07 19:51:19 +10:00
a663cb3e01
Revert "Revert "Report system (version 1)""
...
This reverts commit d0d2de1e21
2016-05-04 15:24:29 +01:00
57fca2a8d0
Temporarily(?) mitigate spigot CME
...
During a PlayerVelocityEvent in an unloaded chunk (usually as result of
a teleport), if one calls Location#getChunk() on the player's location,
and the chunk contains persistent entities, the server crashes with a
ConcurrentModificationException.
2016-05-03 04:56:31 -05:00
cd2bd8ac1d
Fix the TNT Cannon in the tutorial not exploding correctly when fired at the enemy base's doors, as that would cause the tnt entity to just slightly be out of the wall bound and that made the tutorial think that the player missed the wall, making that part of the tutorial near-impossible to pass unless known where to fire exactly. Along with this I also made the cannon rotation lock to a specific range so that people can't miss. Ever.
2016-05-02 11:49:56 +01:00
8a1b5572a8
Fix players in tutorial receiving messages from the real game whenever the message sender is not in a clan.
2016-05-02 10:31:45 +01:00
026ab15099
Fix multiple leaving messages being broadcasted to the server when a player is kicked from the server after getting cbanned.
2016-05-01 23:20:55 +01:00
480cc0f9be
Fix NullPointerException when a player leaves the server without their Clans Ban client being loaded into memory beforehand.
2016-05-01 23:04:30 +01:00
e139bea465
Fix kill messages inserting a space below them in chat.
2016-05-01 23:03:18 +01:00
eae972a3e6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-05-01 10:11:28 +01:00
9d97ea8d1e
Missing Clans ban cache class (to do with the commit previously by me)
2016-05-01 10:11:17 +01:00
4cffb39941
Delay dismount teleport by one tick
...
This mitigates a stack overflow caused by a teleport before a dismount
event processes fully.
2016-05-01 01:30:42 -05:00
189f9ad524
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-05-01 01:42:32 +01:00
2337e89a93
Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well.
2016-05-01 01:42:11 +01:00
8ca38b2598
Prepend http:// to resource pack locations
2016-04-30 18:54:17 -05:00
10166f063b
Merge branch 'develop' into clans/beta
2016-04-30 16:16:57 -05:00
14204fba5c
Changed resource packs to home hosted ones
2016-04-30 16:02:26 -05:00
890ab9f67e
Uncommented ClansBanManager's instances
2016-04-30 16:02:26 -05:00
f1c2e71d56
Some changes to error handlng for clans regions
2016-04-30 16:02:26 -05:00
634a34dd52
Reintroduce non-Air constraint to cannon explosion
2016-04-30 16:02:26 -05:00
2eb7b892e0
Refactor cannon explosion effect for clarity
2016-04-30 16:02:26 -05:00
f2f627116a
Correctly count cannon explosion effect attempts
...
Previously, cannon explosions effects could lock up the main thread if:
- The effect location selection RNG was sufficiently unlucky
- The explosion occured sufficiently deep into a larger claimed
territory
2016-04-30 16:02:26 -05:00
d0d2de1e21
Revert "Report system (version 1)"
2016-04-30 14:53:59 -04:00
6a00f26d5f
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-29 23:42:27 +01:00
81cebc4ce7
Swap static helpers for a much better solution
...
This allows for easier refactoring in the future when we move away
from retrieving the CoreClientManager from a static instance.
Mineplex coding standards are also against the use of static helpers
in scenarios such as this, therefore this commit brings this branch
to be in-line with the coding standards.
2016-04-29 23:37:40 +01:00
f63a872bd4
Changed resource packs to home hosted ones
2016-04-29 14:46:14 +10:00
c814fc73f7
Uncommented ClansBanManager's instances
2016-04-29 12:53:20 +10:00
b4c5be81f3
- Fixed random weather in MCL
...
- Added Elo Division display to /stats for applicable games
- Made fishing rods kept on death in MCL
2016-04-27 23:12:38 -04:00
dab1f9485c
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-04-24 17:17:17 +01:00
b21939444c
Some changes to error handlng for clans regions
2016-04-23 16:40:39 +10:00
d73b720323
Merge branch 'features/elo' into develop
2016-04-22 04:34:35 -05:00
4227e24ae0
Reintroduce non-Air constraint to cannon explosion
2016-04-17 16:29:23 -05:00
e375db5aec
Refactor cannon explosion effect for clarity
2016-04-17 13:33:44 -05:00
ee30012011
Merge branch 'feature/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-17 12:27:23 -04:00
9c6d23f11e
Correctly count cannon explosion effect attempts
...
Previously, cannon explosions effects could lock up the main thread if:
- The effect location selection RNG was sufficiently unlucky
- The explosion occured sufficiently deep into a larger claimed
territory
2016-04-16 07:31:00 -05:00
77b6515387
Don't break the repair anvil more than twice
2016-04-15 12:21:25 -05:00
91d5851628
Don't set a clan's lastOnline time to Timestamp(0)
...
Partially reverts f011fdad5f
2016-04-15 12:21:25 -05:00
0a32eed15d
Fix Cannon TNT firing in the wrong direction and clean up the projectile code, making it more modular.
2016-04-15 00:43:55 +01:00
eb67c12108
Added getRepoElo to EloRepository
...
Added Bukkit.broadcastMessage() calls to test code
Methods that needed to throw SQLExceptions now throw SQLExceptions
2016-04-14 15:21:28 -04:00
29b3f03abf
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-14 21:38:48 +10:00
cbc6689782
Disable /kill in tutorial and reset food level after hold position
2016-04-14 21:38:37 +10:00
eab76fefa2
Fix Cannons sometimes glitching out when the owner's clan is deleted.
2016-04-14 12:09:42 +01:00
3bf3eba005
Completely cancel the explosion falling block for claimed territories.
2016-04-14 12:08:54 +01:00
a295cade1c
Fix Cannon TNT sometimes breaking blocks in protected regions
2016-04-14 11:35:12 +01:00
7cc0583d8e
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-13 19:52:49 +01:00
355ab06e6c
Fix the Conquering attribute working for player attacks as well
2016-04-13 13:08:04 +01:00
6428dfd723
Run clan-load callbacks on the main thread
...
This prevents potential CMEs from occurring when a player transfers
his/her clan to another server
2016-04-12 22:54:20 -05:00
e9d05474f8
Prevent cannons from changing bedrock into charred blocks
2016-04-12 17:14:48 +01:00
c0ebae4175
Ender chest blocker not actually canceling the opening event.
2016-04-12 17:13:03 +01:00
11d92c49ec
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-12 09:48:59 +10:00
eefed175ec
Add the random world event command.
2016-04-11 18:07:11 +01:00
b313bc5308
Make undead chests not show the 'you are not permitted to use ender chest' messages.
2016-04-10 16:52:54 +01:00
313b59d1d6
Fix the terrain finder miscalculating the size of undead camps
2016-04-10 16:51:42 +01:00
e014f4fff9
Fix null pointer in the tutorial when using /tutorial finish
2016-04-10 16:51:12 +01:00
db8ca31567
Fix Meridian Scepter not being perfectly accurate.
2016-04-10 16:16:53 +01:00
0ac9747df1
Modifying how the Meridian Scepter picks a target, as the previous logic was a bit flawed.
2016-04-10 15:27:20 +01:00
9a2f4a8936
Fix Meridian Scepter not damaging the victim (would just give the wither effect)
2016-04-10 15:23:43 +01:00
67a36dc7e4
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-10 12:56:30 +01:00
66274188c8
Add a /we random command to spawn a random world event
2016-04-10 12:56:00 +01:00
37bb64bffd
Fix Undead Camps from spawning outside of the World Border.
2016-04-10 12:47:56 +01:00
3ee1f86841
Fix Null Pointers in the ender chest blocker and regular chest blocker for incognito staff.
2016-04-10 12:36:31 +01:00
8ee2c02dd9
Disable the use of Ender Chests
2016-04-10 11:20:51 +01:00
e8e73306be
Change the Giant's Broadswords regeneration effect level from 41 to 3
2016-04-10 11:15:43 +01:00
dd3e009413
Remove silent chest opening mechanism (which was completely broken), and instead don't allow incognito staff to open chests
2016-04-10 10:53:07 +01:00
ccf9d4a4c2
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
2016-04-09 13:01:04 -04:00
92195a12d2
Completely rework Cannon explosions to use the vanilla Minecraft explosions, as those seem to look much more visually appealing, and have less issues.
...
Fixed a loading and saving bug with Cannons, they seem to be a lot more stable now than before.
2016-04-09 00:37:20 +01:00
6e9ae04118
Cut Gem to Gold conversion rate down to 16 Gems per Gold, instead of 32
2016-04-09 00:27:24 +01:00
05b31725a8
Fix initialization NPE.
2016-04-08 18:48:16 -04:00
a04f7c23c6
Disable incognito for staff in hub invisibility, and vice-versa
2016-04-08 20:18:56 +01:00
59001bdef6
Fix merge-related errors
...
Fix, polish, and re-implement Elo code.
2016-04-07 16:40:30 -04:00
2c05743f62
Stop using static with Siege Manager
2016-04-07 21:01:25 +01:00
390b2878dc
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-07 14:28:30 +01:00
c484a80a14
Remove incorrect import
2016-04-07 08:12:05 +01:00
b70ff03185
Fix siege weapon crater being spawned at the lowest block at the current collision location.
...
This was causing issues when Cannons were fired at a vertical wall, and would not do any damage to the wall as it would just do damage to the blocks at the nearest ground block.
2016-04-07 08:11:37 +01:00
f2ac2d87bf
Remove debug command, that could be very abused
2016-04-07 08:07:18 +01:00
9ccec50fd0
Remove unnecessary database calls that checked for siege weapons remaining in the database, which is not possible, as siege weapons clean themselves up.
2016-04-07 08:06:16 +01:00
3a8ab581dd
Add JavaDoc to new classes to comply with the new standards
2016-04-07 06:52:52 +01:00
91e550bdcc
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/FinishCommand.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/TutorialCommand.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java
2016-04-06 19:40:01 -04:00
d75d63a81a
some missing files and blacklist barrier block from block toss
2016-04-06 18:26:56 +01:00
d25f1abfbf
stop iron door from being opened by players not in clan (outpost)
2016-04-05 23:49:16 +01:00
738825ea9d
perms for tutoirial command
2016-04-05 23:37:08 +01:00
4bdd33c87b
blowing holes in the ground and interacting with cannon sometimes not working
2016-04-05 23:15:38 +01:00
744d8891b4
import
2016-04-05 22:58:03 +01:00
09db5a8131
I'm committing this so I can checkout to a different branch
2016-04-05 16:41:50 -04:00
be63012d18
make trainees+ not count to kicked player count
2016-04-05 12:43:19 +01:00
876a7a8eb6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-05 12:37:23 +01:00
cfac41f216
full server trainee+ fix
2016-04-05 12:37:04 +01:00
e23362bd6f
Fixed NPE in OrderedObjective
2016-04-05 00:36:00 -05:00
b34a175a2b
Fixed error in Outpost throwing NPE.
2016-04-05 00:35:44 -05:00
ae87db1742
Fix TNT generator timings
2016-04-05 13:04:52 +10:00
23232efd63
Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 13:04:39 +10:00
b0dd51843b
Ride horse delay
2016-04-05 10:58:31 +10:00
7f92a3c048
incognito changes
2016-04-05 00:38:27 +01:00
53b25e6ee0
Fixed diamonds not selling in shops.
2016-04-04 17:46:35 -05:00
6558b16004
Fixed endless loop crash bug with Gear attributes.
2016-04-04 17:46:22 -05:00
7de23216f6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 20:41:10 +01:00
b3b72f1ca0
commenting out clans bans
2016-04-04 20:40:58 +01:00
a91ef68978
Fixed CCM in WarPointEvasion.
...
Removed debug message; NOT RIDER
2016-04-04 13:46:39 -05:00
e2baf2b56c
Updated Clans to use the new ResourcePackManager.setResourcePack method.
2016-04-04 13:46:00 -05:00
91ddac9643
Added world checking for boundary stuff.
2016-04-04 10:30:59 -05:00
e8da5ca0f2
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 10:02:01 -05:00
228a001696
Added Shift Left clicking to the ban list for Cannon :D
2016-04-04 10:01:50 -05:00
14207c2073
clansbans
2016-04-04 14:56:20 +01:00
8330ef560d
not rider spam
2016-04-04 14:55:47 +01:00
fecd3c1eaa
Final changes
2016-04-04 23:28:38 +10:00
02cb0e1f7e
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
2016-04-04 13:52:44 +01:00
1dde17b9cc
shooters still shotting fix
2016-04-04 13:51:05 +01:00
e85a1e6a3b
fixes to breakingand placing in claim
2016-04-04 22:22:07 +10:00
4262a4d4b7
Increase radius + delete iron doors after done
2016-04-04 22:07:58 +10:00
963bba06f7
fix for displaying territorial movements
2016-04-04 17:47:58 +10:00
2e0c9d3965
Remove potatoe message
2016-04-04 17:34:39 +10:00
aaccb6fd48
Join/leave/death messages
2016-04-04 17:20:21 +10:00
15c4b2dd58
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-04 17:11:15 +10:00
23e116f9b5
Region fixes
2016-04-04 17:10:52 +10:00
56a087612b
Changes to explain energy goal
2016-04-04 16:58:16 +10:00
02f774ce94
A lot of bug fixes
2016-04-04 16:45:20 +10:00
543719b95d
More tutorial fixes
2016-04-04 14:47:33 +10:00
040026724b
renamed tutorials
2016-04-04 14:10:26 +10:00
29bcd6aeea
more text cahnges
2016-04-04 13:30:15 +10:00
88e56f2ffb
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java
2016-04-04 13:03:24 +10:00
6c92b42335
text changes
2016-04-04 13:01:54 +10:00
29f2442be8
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-04 12:53:07 +10:00
8dee8eab0a
Bug fixes
2016-04-04 12:52:52 +10:00
3173adca53
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 12:49:00 +10:00
5ad877f864
So many fixes <3
2016-04-04 12:47:23 +10:00
0a39b7b756
Fix objective ordering
2016-04-04 12:36:47 +10:00
e11a9379b9
More tutorial tweaking
2016-04-04 12:32:22 +10:00
5195e4a13d
Message fixes
2016-04-04 10:15:15 +10:00
c3a119cfe4
Display completion only to player who completes
2016-04-04 10:11:26 +10:00
a1f284670a
make zombie npcs actually look at the player
2016-04-03 23:49:22 +01:00
3ff5e6d337
npc fixes
2016-04-03 18:47:31 +01:00
7558bd01b7
ensure zombies don't burn to death, by losing equipment
2016-04-03 18:29:13 +01:00
40361acc9b
fixed cannon becoming off-center
2016-04-03 17:51:56 +01:00
ccdd1f901f
cannon 1.9 fixes
2016-04-03 17:23:55 +01:00
f4d4b5c5df
siege weapon interaction fix
2016-04-03 14:08:40 +01:00
66a18dcc87
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
2016-04-03 13:55:17 +01:00
c1b659e738
npcs on enemy base
2016-04-03 13:50:11 +01:00
f5623f00f9
blacklist npe fix
2016-04-03 13:47:57 +01:00
c92d291e96
Shift clicking TNT into the cannon + iron doors fixed
2016-04-03 21:32:56 +10:00
759911396a
More clans bug fixes + message tweaks
2016-04-03 16:11:47 +10:00
5e41c22fc7
- The "WARNING: Clan energy is running very low" message should appear after I get the Buy Energy objective
...
- Need a congrats message/title when tutorial is completed
- Force user to claim via gui
2016-04-03 13:39:32 +10:00
45cbeef83d
- /c sethome shows the wrong message when the bed can't be placed
2016-04-03 13:32:49 +10:00
9f4a2ff7ce
- Shift clicking TNT into the cannon does not work
...
- /c map doesn't work in tutorial (could just remove /c map completely)
2016-04-03 13:31:13 +10:00
664d8b1a4e
Fixes for clans tutorial
2016-04-03 11:04:57 +10:00
b4cfbebf3f
Fix issue with seeling potatoes
2016-04-02 22:53:41 +11:00
d4e9f638da
Fixed a crash bug with title message being too long + other fixes
2016-04-02 22:26:21 +11:00
cc09bf6b51
Fixes to Bull Charge + Adding more instructins to purchasing
2016-04-02 21:43:33 +11:00
15cf7f574d
Fix join/quit messages.
2016-04-02 11:08:40 +01:00
6072753624
Fix shop objective description.
2016-04-02 10:50:46 +01:00
b960925522
Fixes
2016-04-02 20:42:41 +11:00
5a31be1138
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-02 20:33:09 +11:00
673dd327ff
Push for shaun Fireworks
2016-04-02 20:29:56 +11:00
e4b2492b35
Fixed ObjectiveGoal's finish from creating CCMs.
2016-04-02 03:03:17 -05:00
ff41ad248a
Removed PvpTimer
...
Fixed issue where StatManager and FriendManager were created twice.
2016-04-02 02:47:17 -05:00
a6710280fb
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-02 00:45:10 -05:00
01d9c1cd09
Finished the <?> for Objective and ObjectiveGoal.
2016-04-02 00:45:01 -05:00
d161d83d12
Maps and other various fixes
2016-04-02 15:43:03 +11:00
5739b1b87b
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-02 15:13:16 +11:00
3bc1908b57
Fix player quit staying in _active list for Objectives.
2016-04-01 23:10:15 -05:00
0abcd0044b
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-02 10:53:28 +11:00
90e336b18e
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-01 21:51:51 +11:00
42fd210b20
PC-56
2016-04-01 21:51:31 +11:00
fe41e79e8a
Fixes:
...
10 minute timer for creating clan after tutorial.
CCM with LeaveSpawnGoal
Synchronous database calls.
2016-04-01 01:55:08 -05:00
9a1e5099a4
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-01 14:04:12 +11:00
d0bc40b991
PC-56 and PC-65
2016-04-01 14:01:38 +11:00
49441cfaf4
PC-63 and PC-64
2016-04-01 10:47:21 +11:00
3412082f37
PC-61 - Remove all diamonds from inventory after sell diamonds objective
2016-04-01 00:33:42 +01:00
da99a12b23
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-31 20:03:50 +01:00
d353c53524
remove hard-coded access to certain commands for my uuid/name
2016-03-31 20:03:25 +01:00
4ec833727f
PC-20 - Detailed Objective Text
2016-03-31 18:45:17 +01:00
19b2b00a13
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-31 20:35:40 +11:00
86bdbbb8bc
PC-46 + adding in events for buttons
2016-03-31 20:35:21 +11:00
682c365bc6
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-31 20:09:16 +11:00
b3392e78f5
PC-28 - Improve Flow of Tutorials
2016-03-31 20:08:45 +11:00
30a098c645
PC-49 - Kick players out of their clan when they start the tutorial if they have one (from previously playing the tutorial).
2016-03-31 18:24:47 +11:00
7c70092f3b
PC-48 - Create a hologram saying "Jump Off" at the edge of spawn island
2016-03-31 18:19:06 +11:00
e7b9d866ae
PC-57 - Rename Identify Fields to Identify Fields on Map
2016-03-31 17:10:56 +11:00
c51830145e
PC-58 - Close gate to the fields after you sell diamonds
2016-03-31 17:09:51 +11:00
f229da1327
PC-55 - Remove all potatoes from inventory when player completes "Sell Potatoes"
2016-03-31 17:08:26 +11:00
25975e47b8
PC-54 - Rename Identify Shops to Identify Shops on Map
2016-03-31 17:07:08 +11:00
7867da277d
PC-52 - Rename Identify Enemy Clan to Identify Enemy on Map
2016-03-31 17:05:59 +11:00
50518250de
PC-51 - Rename randomClan to EnemyClan
2016-03-31 17:02:38 +11:00
44abf8f1e2
Naming fixes
2016-03-31 16:47:16 +11:00
62280a8fa5
Fix diamond from flying far away when breaking diamond blocks in the fields
2016-03-31 01:11:30 +01:00
622843ca8e
PC-47 - Remove item drops from tutorial cannon hit
2016-03-31 01:08:01 +01:00
0fd39e1300
missing event
2016-03-31 00:47:06 +01:00
36caf16c9a
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-31 00:03:12 +01:00
0f22c4359d
PC-19 - Remove World Event messages for players in Tutorial
2016-03-31 00:02:51 +01:00
978f978023
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-30 23:01:55 +11:00
d6560fcf5c
Fixes to Clan info goal
2016-03-30 23:01:39 +11:00
5652eb75cf
Fix NPE in MountCannonGoal
2016-03-30 22:33:23 +11:00
5149043d14
PC-38 - Don't open gate until player is 12 blocks away
2016-03-30 01:09:29 +01:00
ed65f19417
PC-42 - Fireworks and Effects at end of tutorial
2016-03-29 23:41:31 +01:00
1d4472255f
PC-40 - Add cooldown to Tutorial /c home
2016-03-29 18:50:28 +01:00
0bbfbff0b8
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-29 18:03:49 +01:00
2fcd809447
PC-34 - Effects/Particles when you blow up enemy
2016-03-29 18:03:28 +01:00
cd2d4c0f37
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-29 22:47:39 +11:00
e75c7a3c91
PC-29 + fixes
2016-03-29 22:47:03 +11:00
eab7cbe385
PC-35
2016-03-29 16:29:03 +11:00
f2d450d26b
PC-30 - Claim land objective should use clan GUI
2016-03-29 00:07:50 +01:00
fc473275b0
PC-37 - Move Identify shops objective before go to shops
2016-03-29 00:02:07 +01:00
f8211f26cc
PC-18 - Remove PVP Safety Message in Tutorial
2016-03-28 13:36:43 +01:00
3d0d7f9d71
PC-43 - Remove join/quit messages while in tutorial
2016-03-28 12:38:57 +01:00
fd3a04e794
Fixes for tutorial
...
PC-39 "about energy"
PC-32 Tutorial set home bed
PC-27 Change /c GUI for creating clan
PC-41 Disband via gui not command in tutorial
2016-03-28 22:13:28 +11:00
fa0594b5db
PC-24 - Update Spawn Island Hologram
2016-03-28 13:55:37 +11:00
9ff7e2da82
PC-21 - Combine Tutorial 1 and 2
2016-03-28 11:52:18 +11:00
f7c57a7699
PC-22 - Update Scoreboard Text
2016-03-28 11:47:16 +11:00
8c1b91cbf5
PC-23 - Hotbar Flashing Text
2016-03-28 11:37:35 +11:00
2d30983711
Adjust visuals
2016-03-28 11:29:15 +11:00
1aa4b4a47d
remove player from tutorial on kick
2016-03-27 15:36:54 +01:00
e4e40baf52
final stuff
2016-03-27 06:48:23 +01:00
b4d340a655
cb fixed
2016-03-27 06:21:32 +01:00
a175ead44a
finished tutorial!
2016-03-27 05:43:31 +01:00
a30a591b58
disable certain clans commands whilst in tutorial
2016-03-27 02:04:33 +01:00
a8bd0e4406
add current Clan Outpost to travel shop
2016-03-26 23:20:03 +00:00
2070f0925d
teleport to spawn after tutorial ends
2016-03-26 22:49:06 +00:00
0559ad9567
remove "you have not set a home" message and added a set home message
2016-03-26 22:45:20 +00:00
23cfa8ec25
mine diamonds fix (have to mine 11 instead of 10)
2016-03-26 22:36:27 +00:00
f201898420
mine diamond fix
2016-03-26 22:35:06 +00:00
970d5a307c
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-27 09:17:39 +11:00
bace0b2557
Add Mining shop Location
2016-03-27 09:14:12 +11:00
9e0ba029b4
uhhh what
2016-03-26 22:10:19 +00:00
caf8170a32
Tutorial Changes
2016-03-27 08:47:34 +11:00
a35bbeefdd
attack enemy goals
2016-03-25 12:38:01 +00:00
dade54e5fe
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-25 04:02:16 +00:00
195c990e29
further tutorial progress
2016-03-25 04:01:57 +00:00
8c7d653cca
Store location for teleport home
2016-03-25 13:13:15 +11:00
8afed30c5a
basic classes objectives
2016-03-25 13:07:53 +11:00
d23804be70
fixes for shaun
2016-03-25 01:33:55 +00:00
87b1bf7dd0
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
2016-03-25 01:30:46 +00:00
3cd7a5f12a
NPE fix for cannons and more
2016-03-25 01:29:55 +00:00
c221e0e24f
Fix potatoes
2016-03-25 12:26:13 +11:00
17c214c282
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java
2016-03-25 00:08:28 +00:00
88b0ea1b72
tutorial progressss es
2016-03-25 00:06:51 +00:00
d5a89dc7fe
Push for ben again
2016-03-25 11:05:05 +11:00
7c06186a4f
Fix cleanup and setup
2016-03-25 09:42:41 +11:00
628604c353
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-25 08:44:08 +11:00
051539dbf6
Add cleanup and setup
2016-03-25 08:43:37 +11:00
af87dc9384
unsynchronized siege weapon support
2016-03-24 21:26:40 +00:00
c381cc8fd7
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-24 21:14:34 +00:00
cfb84dd545
fixes for shaun
2016-03-24 21:14:13 +00:00
85511b4c26
Fixes for ben
2016-03-25 08:13:30 +11:00
f000360565
missing a few files
2016-03-24 19:29:45 +00:00
2ef604aeaf
attack enemy goal
2016-03-24 19:11:05 +00:00
7920f2729b
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-24 08:59:09 +00:00
2eb4d89875
i think clans ban is broken in this commit, and i removed some unnecessary spammy debug messages.
2016-03-24 08:58:48 +00:00
4e26d2c7f1
Push code for ben
2016-03-24 19:37:56 +11:00
2a89896084
Tutorial
2016-03-24 17:32:44 +11:00
dbd9567abb
Tutorial work
2016-03-24 15:22:07 +11:00
2e41f906d0
moved completely to database managed clan blacklist, instead of the old hard-coded way
2016-03-21 22:37:35 +00:00
264e5d34b2
missing some files
2016-03-21 05:52:02 +00:00
723f62b8f9
incognito fixes and loads of other fixes
2016-03-20 01:06:46 +00:00
ef1d6ede24
many fixes
2016-03-19 06:31:37 +00:00
a21d43e58f
fix NPE
2016-03-19 06:13:39 +00:00
c4fbae4bd1
added clan name blacklist and changed clans ban GUI
2016-03-19 06:11:32 +00:00
6172be5d76
few changes
2016-03-19 00:13:31 +00:00
2e9562fc50
fixed NPE with one of the tutorial goals. fixed silent chest. fixed invsee, updated regions for new map
2016-03-18 22:31:36 +00:00
8c7da5e98a
some goals didn't commit
2016-03-18 03:01:42 +00:00
3ba138a8d7
some more objectives.
2016-03-18 03:01:11 +00:00
995d454f87
tutorial additions.
2016-03-18 02:47:51 +00:00
3b764920e1
duplicate messages
2016-03-18 01:22:15 +00:00
a4cbe54c78
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-18 01:21:25 +00:00
2cf59ced8b
new pvp timer management, fixed build house task, fixed incognito
2016-03-18 01:18:35 +00:00
a3db70ad9c
clear player inventory on tutorial start (and give map)
2016-03-17 09:44:03 +00:00
e6f4375041
build house goal [still broken]
2016-03-17 02:23:05 +00:00
929981419e
disable item dropping & block breaking
2016-03-17 01:52:36 +00:00
add651780b
priority chat filters, fixed siege weapon clicking listeners being incorrect
2016-03-17 01:06:07 +00:00
b164ff0729
Update res pack
2016-03-16 23:56:39 +00:00
1c1ed1613a
allow kill command while in void/after other damage methods
2016-03-16 23:56:30 +00:00
d625b20ea8
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2016-03-16 22:48:04 +00:00
93767b7a90
tutorial changes, chat filter system, commented out all web stuff for analytics.
2016-03-16 22:46:18 +00:00
2c9021fb81
some chat formatting
2016-03-16 22:31:35 +00:00
7cf49dbe3b
Refactored code to correct errors from previous commit
2016-03-15 20:46:30 -04:00
5fdd3e0872
Updated North, South, East, and West Spawns and Centers
2016-03-15 20:12:09 -04:00
0d237370e1
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-15 23:33:09 +00:00
7589c63904
analytics progress
2016-03-15 23:32:56 +00:00
8897f2e86e
fixed NPE
2016-03-15 23:11:08 +00:00
4638ba909d
siege weapon finalizations & analytics (wip)
2016-03-15 22:52:13 +00:00
4e85a315f9
Objectives!
2016-03-15 11:50:35 -05:00
e53b8616d1
A ton of tutorial work
2016-03-15 10:29:43 -05:00
d7de4381a3
add 200ms damage delay to cannon damages. and add temporary damage holograms
2016-03-15 00:49:37 +00:00
13bbcc51dc
remove cannon pickup feature
2016-03-15 00:23:59 +00:00
3ae89e12a8
improve cannon UI
2016-03-15 00:21:37 +00:00
c556d7b3c3
fix ConcurrentModificationException
2016-03-15 00:21:15 +00:00
864b12adbf
make cannons explode chest items
2016-03-15 00:20:40 +00:00
e08ba29ac1
Final fixing of cannon saving/loading
2016-03-14 22:48:31 +00:00
422df69335
incognito async stuff and updated alpha holograms
2016-03-11 21:50:48 +00:00
bfdb7add2e
run siege weapon queries async
2016-03-11 21:04:22 +00:00
1008c58e91
removed catapult code as it's very out of date at this point (and it's not being used hehe)
2016-03-11 19:33:02 +00:00
eb0da6552c
add C.cBlue to name of Outposts & Cannons.
2016-03-11 19:31:24 +00:00
523c194c56
Fix data values not being correct in shop page.
2016-03-11 19:31:05 +00:00
d1c7879224
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-11 19:08:40 +00:00
45a0853564
remove test classes
2016-03-11 19:07:11 +00:00
86c50cc3cd
updates
2016-03-11 19:03:32 +00:00
1228ca227e
Add support for 1.9 resource packs, Text Tutorials
2016-03-11 11:50:08 -06:00
2aa68d3e16
final stuff and map
2016-03-11 04:14:16 +00:00
0e276474c5
fixerroooniissssss
2016-03-11 02:20:18 +00:00
57c65cf5ff
some changes and vanish fixes maybe?
2016-03-11 01:47:14 +00:00
8ce32fcdfa
little tweakers
2016-03-11 00:58:47 +00:00
bcfe4a42c0
changerooonis
2016-03-11 00:41:28 +00:00
33d978c6d6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-10 22:12:41 +00:00
20ade492a8
tnt generator changes
2016-03-10 22:09:45 +00:00
76782fd420
Fix issues
2016-03-10 15:07:22 -06:00
c2f6217d9f
allowed sr. mods to use /we (TEMP)
2016-03-10 17:38:16 +00:00
0fd0a7fb44
mak esupply drop beacons more specific
2016-03-10 17:38:03 +00:00
2d2e88e069
some fixes and updates
2016-03-10 02:47:48 +00:00
9b40496a1e
siege weapon picking up
2016-03-09 23:56:25 +00:00
1532abcc62
disable nether and legendary fixes
2016-03-09 21:12:02 +00:00
70aa5d63fd
touched up on some messages
2016-03-09 13:10:39 +00:00
51e5552e2d
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-09 11:56:25 +00:00
cf6645cec7
Legendaries and other preparation for beta
2016-03-09 11:55:40 +00:00
e3fb40805c
all siege items shouldn't be able to be placed or used while on PvP timer.
...
Fixes to Jagged prefix
2016-03-09 22:46:45 +11:00
5b3da3d06f
Consistency. (Changed Vanish to Incognito)
2016-03-09 01:53:01 +00:00
befb27d3db
Finalized Vanish system
2016-03-09 01:45:17 +00:00
ac91ba690c
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 16:08:14 -05:00
b8f06374cd
Made changes to accommodate for Clan ELO's
2016-03-08 16:07:52 -05:00
99c2fefed2
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-08 12:27:45 -06:00
3283b873e7
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-08 12:19:28 -06:00
26b7ea2d59
fixes
2016-03-08 18:19:12 +00:00
876a568bd0
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/OutpostRepository.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
2016-03-08 12:17:07 -06:00
ffd9d98d2e
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-08 12:15:47 -06:00
e39b3de237
Fix errors
2016-03-08 12:12:44 -06:00
890a3f4bc9
Merge develop into clans/beta
2016-03-08 12:09:04 -06:00
d86ef81056
weaps oops
2016-03-08 01:11:16 +00:00
9953388b92
iunvseeeeeeeeeeee
2016-03-08 00:32:36 +00:00
48cfe4d91c
fixed & inv see?
2016-03-08 00:27:06 +00:00
ae42aaaab1
Sammy changes + cleanup
2016-03-07 03:25:22 +00:00
7e2086df1c
flash fix, rares update, and outpost fixes
2016-03-06 19:55:58 +00:00
ae2da31544
Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-05 23:14:32 +00:00
8cfbe20a08
re-added delay to /spawn
2016-03-05 23:09:57 +00:00
d92f817efc
fixed some teleportation bugs and a bit of cleanup
2016-03-05 22:50:06 +00:00
e88736c1aa
changes to scepter, NPE fix
2016-03-05 20:46:24 +00:00
d79107eaaa
new legendary weapons and nether finzlizations
2016-03-05 03:07:25 +00:00
7b9ff288f3
nether progresssisiannsnsssss
2016-03-03 23:23:20 +00:00
73d8870daf
nether work (forgot to commit days ago oops)
2016-03-02 19:42:53 +00:00
d524645ddd
placed the clan name hologram thingy correctly because it's inside the outpost!!!
2016-02-23 19:11:29 +00:00
d65bf965c4
fix only some blocks of outpost being reset and explosion particles not showing up
2016-02-23 18:51:34 +00:00
2956b18821
some hologram work
2016-02-23 18:45:04 +00:00
879a211a41
change siege weapon damage indicator display length
2016-02-23 17:00:14 +00:00
deb22fd4e7
add 'time till despawn' hologram on outposts and the owner clan of the outpopsts above doors
2016-02-23 16:54:07 +00:00
205e3885b8
disallow players on pvp timer to use bows
2016-02-23 16:14:56 +00:00
41e140d5ca
stop players from placing water in outposts
2016-02-23 16:07:12 +00:00
bcd4480f23
stop recruits from opening trapped chests
2016-02-23 15:57:12 +00:00
306e56980c
remove weapon teleport fix
2016-02-23 14:44:07 +00:00
de4568d448
accurate-ish weapon damage tracking
2016-02-23 13:03:50 +00:00
f0fc2fd519
progress [testing github]
2016-02-22 20:44:00 +00:00
99150db2d7
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2016-02-22 19:02:54 +00:00
76cf65c267
siege system changes
2016-02-22 09:34:04 +00:00
db7382d01e
testing github?
2016-02-21 01:34:13 +00:00
67c355bf65
remove more eclipse files
2016-02-19 07:22:54 +00:00
441cf702c7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-02-19 07:22:09 +00:00
d5583b93f2
remove eclipse files
2016-02-19 07:14:13 +00:00
7714e4960c
Use DBPool for everything
2016-02-19 00:17:38 -06:00
dc5fe21f3d
more npe checking
2016-02-18 21:53:55 +00:00
24b834370b
null pointers with siege weaponl oading
2016-02-18 21:37:13 +00:00
8507bb1bd8
all progress over this week
2016-02-18 21:29:42 +00:00
e25accfba4
outpost saving and loadi9ng
2016-02-15 11:24:29 +00:00
d7ad2cdc58
moar undead fixes
2016-02-14 12:37:37 +11:00
93a5ca6777
weapons need to be centered
2016-02-14 00:45:54 +00:00
24254635a8
Fixes to observer settings
2016-02-14 09:51:59 +11:00
e6eb43ada8
PUSHING CODE BECAUSE MY HDD MIGHT BE BREAKING DOWN. THIS CODE IS UNTESTED PROBABLY DOESN'T WORK
2016-02-12 19:58:40 +00:00
90570c1185
progress on saving outposts/wepaons so far. not finished. probably going to change it to a different format
2016-02-12 07:00:21 +00:00
67b12f3ae2
loads of progress
2016-02-10 19:24:57 +00:00
b308d1759f
renamed stuff to more sensible stuff. :}
2016-02-10 13:02:55 +00:00
2be917e623
give enemy info about time before siege and after outpost is built, the health of the outpost
2016-02-10 13:01:31 +00:00
69bdbdde70
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-02-10 11:54:36 +00:00
35f0162882
make catapults rideableeeeeee
2016-02-10 11:09:17 +00:00
43cf4d38ef
give player arrow back after failed territory siege declaration arrow thingy fire thingy ehh grammar is not needed at night :}
2016-02-09 21:36:58 +00:00
e74cefeee8
increased siege weapon placement area, and made outposts handle siege weapons that are placed within them
2016-02-09 19:59:01 +00:00
e782097563
shouldn't be able to fire weapons whilst in siege wait time
2016-02-09 19:49:25 +00:00
2b44b88ea2
not being able to fire bow without the correct class and changed arrow to actually be an arrow
2016-02-09 19:48:48 +00:00
67d1bffe82
npe and clan minimum players set for siege
2016-02-09 19:47:42 +00:00
9342bee371
das ist gut
2016-02-09 17:05:59 +00:00
99ece6eaea
add chest with arrwos to outpost. test for clans in area
2016-02-09 05:53:37 +00:00
dd2fe36a3d
added "Borderlands" to Clan name blacklist
2016-02-08 22:23:26 +00:00
052d3c3380
siege system updates
2016-02-08 21:33:12 +00:00
b8471d7a8e
getter for crater size
2016-02-08 20:46:15 +00:00
3ee3059bc7
against clan needs to have a getter
2016-02-08 18:38:30 +00:00
9379c4190a
add against clan to outpsots and also renamed "clan" to "owner" to make it more obvious
2016-02-08 18:31:03 +00:00
4f5625d63e
Clans Alpha 1.0 changes
2016-02-05 18:42:22 -05:00
27e4ef784c
WP Evade
2016-02-06 08:44:37 +11:00
9dc34b5a60
better damage calculation and fixed messages for siege weapon damaging
2016-02-05 19:12:12 +00:00
b0888208d1
More alphs bug fixes
2016-02-05 23:55:38 +11:00
e448046e4f
made inv get cleared on fire
2016-02-05 10:40:53 +00:00
bef898afc1
final fixes (? (still broken))
2016-02-05 01:01:10 +00:00
6291decf87
Fixes to flame and broadsword
2016-02-05 11:42:39 +11:00
1b92871b93
remove annoying debug messages
2016-02-04 23:50:44 +00:00
62d45d5419
fix flip starngesness
2016-02-04 23:49:02 +00:00
f5d826a2cb
two parentheses. all it took to fix it. GRRR
2016-02-04 23:42:27 +00:00
8c1ae12d19
beta stuff
2016-02-04 23:29:48 +00:00
73d4ff2639
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-02-05 10:12:31 +11:00
6fd9cffb01
Clans alpha bug fixes
2016-02-05 10:12:18 +11:00
16012285e0
rotation fix
2016-02-04 23:11:51 +00:00
6c7d08a8f9
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-02-04 22:55:53 +00:00
e61b36f55c
Fixed /c stuck timer taking 7 seconds instead of 2 minutes
2016-02-04 22:55:37 +00:00
03da4485b3
pushing to switch to clans/alpha
2016-02-04 22:54:43 +00:00
bc19cf01f7
hopefully that fixes the location offset =/
2016-02-04 22:48:11 +00:00
fa460dbd45
catapult rotatyyyy
2016-02-04 21:50:47 +00:00
50c2da2a95
forgot to include this; version getter thingy in Clans
2016-02-04 16:10:14 +00:00
5a8fae4974
stop catapult projectile from getting stuck on bounding box
2016-02-04 16:09:32 +00:00
ecdd21a800
version or plugin command now shows version of clans
2016-02-04 16:09:13 +00:00
b13494f399
more modifications to siege weapons.
2016-02-04 16:00:41 +00:00
c17849b751
fixed some autoboxing stuff
2016-02-03 17:30:07 +00:00
4e2da061bb
added protection around siege weapon
2016-02-03 17:07:06 +00:00
4488b73e93
change catapult bounding box to 3
2016-02-03 17:02:31 +00:00
0cb557d922
moved some stuff around and slight changes
2016-02-03 17:02:06 +00:00
38cae1e3a2
catapult implemented using new siege weapon system, cannons polished up. not tested completely. don't expect this code to work fully haaha
2016-02-03 15:28:53 +00:00
6bba486385
Added message if cannon is not loaded correctly
2016-02-03 11:20:11 +00:00
d4388870c1
fixed inventory opening on mount
2016-02-03 11:19:33 +00:00
8004d0dc3c
fixed npes
2016-02-03 11:06:58 +00:00
95741e3029
fixed siege weapon base
2016-02-03 10:53:53 +00:00
5fd089c768
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-02-03 17:43:43 +11:00
f011fdad5f
Fixes to TntProtection
2016-02-03 15:10:56 +11:00
0e0582a1a7
Added safe zone protection for flame
2016-02-03 10:39:21 +11:00
Sam Sun
samczsun
AlexTheCoder
Shaun Bennett
LCastr0
Ben
cnr
phobia
Keir Nellyer
Conrad
Jonathan Williams
Joseph Prezioso Jr.
Conrad S
Keir Nellyer
Shaun Bennett
Cheese
William Burns