cd237b8d3b
Make players teleport to shops once they return to the nether
2016-07-30 17:42:57 -04:00
d12d353c20
Fix pronoun in message autoreply
2016-07-30 17:36:03 -04:00
2d39dbfb58
Move clans admin text
2016-07-30 17:34:03 -04:00
fe92633802
Add claim limit override for admin claiming
2016-07-30 16:49:39 -04:00
d1d366dcf8
Add a cooldown to clans shops to reduce chance of edge-case negative gold balances
2016-07-30 09:46:02 -04:00
9e2ba8c653
Fix fissure applying to anvils
2016-07-30 09:36:38 -04:00
ecb56bf450
Fix players being able to use de-blink to teleport between worlds
2016-07-29 13:35:09 -04:00
96e0625548
Fix mislabeling of shop item in user display
2016-07-29 03:15:22 -04:00
d853f8467c
Merge branch 'update/clans' into develop
2016-07-28 22:56:23 -05:00
9529789159
Remove 3 second chat delay.
2016-07-28 22:54:04 -05:00
62e0a39ee8
Fix some medium graphics issues
2016-07-28 23:28:47 -04:00
8d0dc0ce08
Merge branch 'feature/party-v2' into develop
2016-07-28 21:19:52 -05:00
f53503f16a
Move code in sync runnable
2016-07-28 21:07:29 -04:00
dddfb4420c
Fix players being allowed to recall through worlds
2016-07-28 21:05:25 -04:00
841a44b8a6
Make clan create button functional
2016-07-28 21:02:04 -04:00
16804a860c
Made duping usage for class shop impossible
2016-07-28 20:22:30 -04:00
97d5d21a55
Fix lightning orb duping
2016-07-28 19:43:43 -04:00
853fe31fbe
Merge branch 'update/clans' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-28 19:11:39 -04:00
3aad06cc8a
Make Clans displayed as FULL instead of BETA in server compass
2016-07-28 19:11:14 -04:00
47d79bbad5
Fix bugs arising during clans release
2016-07-28 19:08:47 -04:00
f3944527f8
Display clans purchases properly in support server
2016-07-28 19:08:24 -04:00
a498bc13db
Reinstate async wrappers for clans gold access
2016-07-28 14:59:43 -05:00
9c42f4c147
Use the proper boostergroup for amplifier thanks
2016-07-28 13:27:48 -05:00
f0be7794f5
Lower skeleton king passive rate
2016-07-28 06:16:20 -04:00
4efe1fe76d
Make boss portals open where the boss spawned
2016-07-28 05:46:26 -04:00
c30d30b2e7
Fixes event mobs getting stuck outside
2016-07-28 05:33:37 -04:00
ab9bf2f405
Fixes possible bug with party leaders not seeing chat.
...
Adds pling when you received an invite.
2016-07-28 03:40:24 -05:00
639e089901
Disable clans tutorial
2016-07-28 04:28:34 -04:00
aef94e13a8
Fix message not being sent
2016-07-28 04:18:29 -04:00
b718a72366
Fix shop chunk size being too small for map
2016-07-28 02:59:03 -04:00
dd38a1dd76
Merge branch 'update/clans' into develop
2016-07-27 20:40:35 -05:00
d5a1312c48
Update border size to match new map
2016-07-27 20:46:40 -04:00
05e59ae9cc
Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing""
...
This reverts commit 917b83250d
2016-07-27 19:03:04 -05:00
00c0e38b82
Kit upgrades now display
2016-07-27 23:02:40 +01:00
749fa36a5a
remove debug and check for Integer class
2016-07-27 16:47:08 -05:00
646ce96250
Ensure gold balance row is present
2016-07-27 16:15:03 -05:00
62871686b0
Update clans store items to currency changes
2016-07-27 16:57:07 -04:00
dfbebe11f4
Use separate gold balances for each clans server
2016-07-27 15:52:07 -05:00
031a9575ae
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-27 15:13:18 -04:00
6180bea5cc
Update clans drop aesthetics and spawn/shop locations
2016-07-27 15:07:11 -04:00
43c45f4094
add timer to dragon escape
2016-07-27 13:59:35 -05:00
8648581140
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-27 19:57:25 +01:00
167c0f2b5e
Reimplement EnergyShopButton with new machinery
2016-07-27 13:52:03 -05:00
3cddf35d12
Refactor out legacy ConfirmationPage
2016-07-27 13:52:03 -05:00
3d0cc2a5fd
Refactor Clans gold dependency out of core
2016-07-27 13:52:03 -05:00
dc96258055
Merge branch 'feature/party-v2' into develop
2016-07-27 13:19:25 -05:00
0d46bc4609
Add Amplifier thank button
2016-07-27 13:17:36 -05:00
72b5507390
Fixed PC-120
2016-07-27 12:29:07 +02:00
161381f393
Fixed PC-698
2016-07-27 12:09:59 +02:00
157c969e8d
Completely prevent players in parties from joining Clans servers
2016-07-27 05:51:49 -04:00
d162750aec
Keep nether loaded if its not empty
2016-07-27 04:47:03 -04:00
ea3cb36d3a
Clean up miniboss mobs after their chunk unloads
2016-07-27 04:43:00 -04:00
85cf005eba
Small clans economy changes
2016-07-26 22:33:19 -04:00
9c700425fd
More javadocs
2016-07-26 22:32:46 -04:00
d98ca0ab3c
Remove unused miniboss
2016-07-26 09:00:37 -04:00
bb5d766ba6
Patch war point evasion by committing suicide in safezones
2016-07-26 07:35:11 -04:00
34d5fb5e24
Fix craters getting glitched in wilderness
2016-07-26 07:15:40 -04:00
e396acc69c
Fix clans ips being added to the bungee rotator
2016-07-26 07:15:09 -04:00
4df8de58a6
More javadocs
2016-07-26 05:51:42 -04:00
bf5e9f1d76
ADD JAVADOCS TO CLANS
2016-07-26 05:50:43 -04:00
61eca3ced0
Removed auto disguising from clans hub and removed clans tnt protection
2016-07-26 00:54:31 -04:00
7b358adba1
Prevent runed pickaxe from destroying the nether
2016-07-25 20:26:23 -04:00
b41ad2e087
Fix NPC orientation in clans hub
2016-07-25 12:28:25 -04:00
aecaa89443
Update clans hub spawn location
2016-07-25 12:08:37 -04:00
9a73784b7c
Make clans in the hub route through clans hubs
2016-07-25 11:18:10 -04:00
a1fd021f8d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-25 10:59:38 -04:00
6f0d21120e
Serious tweaks to gameplay and begin documentation
2016-07-25 10:59:03 -04:00
0ecdce4edc
Add clans hub to maven
2016-07-25 10:58:32 -04:00
979bb92034
Allow treasure chests to be placed in other locations instead of fixing them in the main hub's configuration
2016-07-25 10:57:15 -04:00
25b0ae5916
Add support for sending players back to any clans hub via portal
2016-07-25 10:56:30 -04:00
275ab52f79
Create a clans-only hub
2016-07-25 10:55:18 -04:00
9fab8366b7
Add support for clans hub connection inside bungees
2016-07-25 10:52:48 -04:00
5180e46be7
Revert party chat symbol to "@". Change team chat symbol to "#".
2016-07-24 22:17:50 -05:00
a23c2c4e1c
Update UI to reflect allowing upgrades to be shown, per kit.
2016-07-24 16:05:19 -05:00
4728a50ca9
Small message change
...
Avoids using two variables
2016-07-24 11:49:57 +01:00
ceccf2d2ac
Don't give the item when a game is in progress.
2016-07-23 22:36:53 -05:00
133376fb94
Relocation of Full server check in party invites. Fixes a bug where people cannot invite players to their party, regardless of which server they are on, when the inivters server is full.
2016-07-23 19:50:57 -05:00
50de769e36
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-24 00:13:13 +01:00
03b3c1864d
Map crumble issue
...
Fixes an issue where the max distance of a map would not be calculated
correctly affecting the map crumble
2016-07-24 00:12:48 +01:00
818ed4c9a9
Set up clans monetization features in the shop and fix some hardcoded names in core
2016-07-22 00:18:34 -04:00
869dfc1dfa
Finalize Amplifier system
2016-07-21 20:21:11 -04:00
5d0b5f80c0
Fix Party server sending. Tweak playercount and GUI display
2016-07-21 18:01:43 -05:00
891a3231d8
Change banner GUI
2016-07-21 17:37:02 -04:00
b87c6cfff0
Fix git removing class
2016-07-21 17:27:41 -04:00
75cc75f40c
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-21 17:25:15 -04:00
55c63364f2
Fix KOTH starting in other hub worlds and hub basketball teams always being null
2016-07-21 16:57:24 -04:00
2b8930eee8
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-21 15:32:49 -05:00
d7c5184980
Party fixes and tweaks.
2016-07-21 15:24:48 -05:00
286a7aa32a
Even more debug
2016-07-21 16:16:38 -04:00
4a77a587f8
Fix git removing a class
2016-07-21 16:11:05 -04:00
b5ce35544f
Fix merge conflict
2016-07-21 15:48:56 -04:00
fc3ceddf4d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-07-21 15:47:59 -04:00
97ef408e14
Debug
2016-07-21 15:46:48 -04:00
9ed0bbe43a
Fix NPC's for unloaded worlds
2016-07-21 14:22:38 -05:00
0262452b6a
Add enchantments to items, lower arrow spawn rate and limit, give players some steak and make armor unbreakable.
2016-07-21 13:59:35 -05:00
11992129d1
Convert to EntityPortalEnterEvent
2016-07-21 14:01:08 -04:00
d59882007b
Slightly increase boundaries
2016-07-21 13:55:09 -04:00
37cf863625
Tiny fixes
2016-07-21 13:46:13 -04:00
57f9f7db4b
Fix ClassCastException
2016-07-21 13:25:17 -04:00
1f2b1557d5
Work on amplifiers and deleting banners when the clan is deleted
2016-07-21 13:20:45 -04:00
faece2c5f8
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-21 11:13:15 +01:00
e5cd38c11b
Revert enjin changes
2016-07-21 05:20:47 -04:00
2615ef74dd
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-21 05:09:54 -04:00
1dedde41a8
Banners and beginning javadocs
2016-07-21 05:09:31 -04:00
b48f97fd2e
Fix stupid JOOQ issue and IntelliJ.
2016-07-21 03:46:18 -05:00
b734dc4e87
Remove Pay wall for Party sizes
2016-07-21 02:59:15 -05:00
9f0f4e0018
Fix possible cross server invite spamming.
2016-07-21 02:20:02 -05:00
f1b3c4756d
Use UUID's instead of playernames.
2016-07-21 02:16:26 -05:00
4cab91f251
Use getPlayerExact.
2016-07-21 02:05:37 -05:00
76ac89266e
-sigh- a hotfix.
...
Won't invite players across servers who are already in parties.
Fix transferring ownership to non-party members
2016-07-21 02:05:10 -05:00
e7da161f35
Revert "Fixed PC-706"
...
This reverts commit 96d16be5b7
2016-07-20 20:07:06 -05:00
b0f5b536b1
Merge branch 'feature/party-v2' into develop
2016-07-20 18:06:14 -05:00
31d6a2542d
Replace runSync call with runAsync
2016-07-20 18:03:01 -05:00
b136372d1b
Gem fountain changes; increase goal, link to eu
2016-07-20 18:03:01 -05:00
c3b7a81730
Don't show all buttons in all menus. Protected fields != private fields.
2016-07-20 17:48:24 -05:00
9a06cce0a0
Merge branch 'feature/party-v2' into develop
2016-07-20 16:41:50 -05:00
0fc64c45a8
Update JoinResponseReason
2016-07-20 16:33:26 -05:00
96261c1a6d
Party PR Updates.
2016-07-20 16:18:49 -05:00
67a185acc9
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-20 15:52:59 -05:00
ff210271c9
Add javadocs
2016-07-20 12:21:15 -04:00
0b4c9d78ff
Finalize game integration into map
2016-07-20 11:22:14 -04:00
29d52ac075
More work on Nether
2016-07-20 10:42:24 -04:00
136eb078ef
PC-426: Update UX for non-premium players:
...
Removes the in game advertisement display when selecting servers.
Removes all chat throttling.
Adds a message sent on join to the player, promoting the newest sale or promotion.
2016-07-20 06:59:37 -05:00
d53a917627
getAbilityDetails using map and list interface
...
Changes so it uses the interface rather than the concrete class.
2016-07-19 22:38:32 +01:00
7e26480452
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-19 22:29:00 +01:00
3411a3b978
Throwable Dirt colliding issues
...
Fixes the falling dirt block colliding with the thrower.
2016-07-19 22:28:56 +01:00
8b552a69de
Removal of debug message
2016-07-19 21:45:03 +01:00
765958a421
Code cleanup for PerkDirtCannon
...
Cleans up some bad code in PerkDirtCannon and now removes the dirt
blocks on death.
2016-07-19 20:51:14 +01:00
7470078da9
Typo in PerkFireBurst
...
Should say Blaze Rod instead of Snowblock
2016-07-19 20:50:19 +01:00
588e32e1b1
Addition knockback perk for Earth Kit
...
Adds a perk so that the Earth kit takes 75% less knockback while on the
ground
2016-07-19 20:49:27 +01:00
0390822fd7
IceBridge item no longer droppable
2016-07-19 20:48:36 +01:00
63a0eebd02
Increased chance enchanted of armour
2016-07-19 20:48:12 +01:00
0eac157701
Implement basketball features in the hub and begin setting up coordinates
2016-07-19 12:45:38 -04:00
c32e647d9e
Add private messaging system
2016-07-18 22:21:09 -05:00
ce4289fa00
Don't do weather.
2016-07-18 22:13:32 -05:00
c8075b2b47
Merge remote-tracking branch 'origin/feature/party-v2' into feature/party-v2
2016-07-18 19:04:26 -05:00
b4aa303923
Bug fixes.
2016-07-18 19:04:02 -05:00
36f2873e15
Map Parser update.
2016-07-18 19:00:11 -05:00
5ecfaef413
Merge branch 'feature/mavericks-master-builders' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
2016-07-18 16:28:22 -04:00
c58d226680
More work on Nether and Runes
2016-07-18 16:26:05 -04:00
4238a1c385
Implement rune system and main nether minibosses
2016-07-17 07:14:08 -04:00
370b0693d9
fix the server thinking it's the next week
2016-07-17 05:20:21 -05:00
0ae4b0c5e0
Temporarily disable anti-xray in UHC
2016-07-16 23:08:18 -05:00
98e88d1b77
Disable bosses not scheduled for initial releases
2016-07-16 22:00:38 -04:00
08850d909f
Further work on brood mother boss and nether
2016-07-16 21:59:03 -04:00
e2af4df44b
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-16 21:22:57 +01:00
34f718b2ec
Fix improper gem/shard reward handling
2016-07-16 06:27:16 -05:00
30111eb940
Duplicate enchantment fix
2016-07-16 11:16:57 +01:00
951e07488a
GI changes from testing session
2016-07-16 11:15:33 +01:00
f012e8d4ed
Merge from develop
2016-07-16 08:41:15 +01:00
8523d56bbf
Merge fix
2016-07-16 08:33:41 +01:00
d901fce3ac
Experimental Skywars Kits
2016-07-15 23:07:17 +01:00
728a91da0f
adding damage outsid ethe loop
2016-07-15 04:57:44 +02:00
3070835662
enable armor protection and fix shotguns
2016-07-15 04:39:53 +02:00
6c7f2d8b0d
fix damage in DM prepare, eating grenades and no health regen
2016-07-15 02:28:22 +02:00
d54e47d8ea
Check for uptimes field
2016-07-14 11:22:10 -05:00
a0847b8d1a
Fix null ServerGroup uptimes value for MPSes
2016-07-14 08:08:24 -05:00
1a2e0df6ca
Only allow OPs to use minestrike debug commands
2016-07-14 07:28:33 -05:00
1d1c3ef1be
Merge branch 'thanos-mineware' into develop
2016-07-14 03:41:00 -05:00
40345bc93c
Fix Bawk Bawk Battles game start
2016-07-14 11:23:39 +03:00
4d0903dba7
Fix compile error
2016-07-14 03:11:59 -05:00
e28320b361
Fix disableCustom not firing properly
2016-07-14 02:47:49 -05:00
7cc44c8bfc
Merge branch 'thanos-mineware' into develop
2016-07-14 00:22:01 -05:00
906762e9db
Remove debug commands
2016-07-14 08:17:36 +03:00
917b83250d
Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"
...
This reverts commit 30287a0832b8650d741d
2016-07-14 00:10:37 -05:00
7dcf7378ef
Many changes
...
Fix spectator race condition
Refactor out cut clean into modules
Add combat log module
Add antixray module
2016-07-13 21:30:54 -05:00
a7b30f4f59
Merge branch 'thanos-mineware' into develop
2016-07-13 21:26:25 -05:00
4343fa3512
Merge branch 'project-cosmetics' into develop
2016-07-13 21:22:41 -05:00
a34ac42093
Amplifiers adjustment - shards only
2016-07-13 19:26:23 -05:00
6af04b5438
Fixes for winroom gadget disable messages
2016-07-13 18:21:08 -03:00
6082418fc7
Update game tags on the hub game compass
2016-07-13 23:59:37 +03:00
4e985b85e6
Make final challenge changes
...
- Increase Color Change delay
- Make Tag Master not count for players jumping into the void
2016-07-13 23:59:01 +03:00
369dabffae
Amplifier updates - move to boost shards only
2016-07-13 15:07:24 -05:00
711a04ffa8
Add Bawk Bawk Battles to hub compass
2016-07-13 21:40:31 +03:00
3497a4c095
Remove unused debug messages
2016-07-13 19:29:48 +03:00
9c3aee6373
Convert all possible gem vote rewards to treasure shard vote rewards to comply with Mojang EULA
2016-07-13 11:17:24 -05:00
6c11b718af
Remove suppress warnings annotations
2016-07-13 19:03:39 +03:00
dab3e09837
Achievement fixes, minor challenge changes
...
- Fishing Day was marked as deprecated.
- Surf Up will no longer track waves in which players were killed.
- Make Bouncing Shadow not count players that lost.
- Tag Master will now select alive players only.
- Removed debug messages.
2016-07-13 18:52:14 +03:00
ad32f4e2f1
Remove unnecessary new string declaration
2016-07-13 18:05:35 +03:00
839d9263fd
Prevent game crash if started with one player
2016-07-13 18:03:38 +03:00
efce89a7e7
Fix Color Change platforms not removed properly
2016-07-13 17:47:17 +03:00
2e5d7c023f
Fix Tag Master, show bouncing block full score
2016-07-13 17:13:02 +03:00
2034b5536e
Update and enable Clans Freezing
2016-07-13 09:42:46 -04:00
7df228a8fa
Move WinEffectGadget schematics to update folder
2016-07-13 06:36:42 -05:00
6cef42d7a4
Fix merge issues
2016-07-13 13:36:59 +03:00
179b59af2c
Merge branch 'develop' into thanos-mineware
2016-07-13 13:28:03 +03:00
943dc88ca4
Modify challenge list, change display messages
2016-07-13 13:23:15 +03:00
e40abd4859
Merge branch 'thanos-mineware' into develop
2016-07-13 05:04:50 -05:00
2f6e140b34
Item in hand change (Devourer)
...
Changes the item in the NPC's hand for Devourer from OBSIDIAN to a
DIAMOND_CHESTPLATE
2016-07-12 21:57:37 +01:00
5382afedda
Sharpshooter arrow limit changed to 4
2016-07-12 21:56:25 +01:00
85db0ad613
Remove global rawr
2016-07-12 15:51:47 -05:00
654ab281ea
Add option of "uptimes" to servergroups
2016-07-12 15:44:29 -05:00
0f3b2da8b7
Fix Bouncing Block, re-add features for testing
2016-07-12 23:02:01 +03:00
daddaa477e
Merge branch 'update/brawl-games' into develop
2016-07-12 06:45:32 -05:00
f0db20dbc2
Fix some minor spelling and grammar issues and implement a requested player freezing system for Clans
2016-07-12 05:21:50 -04:00
3acca23e7e
Remove emerald drops from Skeleton King minions and decrease the range EventCreatures can go from their spawn
2016-07-12 05:20:22 -04:00
9cf5a6fb9e
Fix Absorption in OP MB, add more arrows to OP MB, fix not being able to purchase primary weapon in MS, fix skin bug in MS and fix helmet drop when scoping in Strike Games
2016-07-12 05:39:21 +02:00
ac8a920484
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/brawl-games
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/GunModule.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java
2016-07-12 03:07:31 +02:00
5bf0ef545b
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-11 23:19:39 +01:00
d3270b9289
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-11 14:50:16 -04:00
AlexTheCoder
cnr
TadahTech
Shaun Bennett
Sam
xXVevzZXx
xGamingDudex
Thanos Paravantis
samczsun
LCastr0