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
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
14e5928b00
Add a pull request template
2016-07-20 17:33:03 -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
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
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
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
34f718b2ec
Fix improper gem/shard reward handling
2016-07-16 06:27:16 -05: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
AlexTheCoder
Shaun Bennett
xXVevzZXx
TadahTech
cnr
Thanos Paravantis