JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,252 Commits 1 Branch 0 Tags 481 MiB
b27e1ffbd1
Commit Graph

4029 Commits

Author SHA1 Message Date
Sam
604f5bc2cc Update to work with new scoreboard system 2016-08-16 11:03:12 +01:00
Sam
29a07c60ab Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-16 11:02:15 +01:00
Sam
84e5b38380 Testing session feedback 2016-08-16 10:53:37 +01:00
Sam
dac4d9595c Change scoreboard to use new system 2016-08-15 20:28:12 +01:00
Sam
6839006bd1 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-15 20:25:01 +01:00
Sam
d5d8f07085 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple 2016-08-15 19:21:56 +01:00
Sam
df606d5e07 Changed game logic to try out multiple round concept 2016-08-15 19:19:20 +01:00
Sam
09741d4d2a Added VersionModule (The new way to check client versions for games) 2016-08-15 19:18:51 +01:00
Sam
ea7d877d36 Some attempt at per player kits 2016-08-15 17:45:24 +01:00
xGamingDudex
e71cec874e Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698 2016-08-14 20:09:01 +02:00
Sam
8f4303cf39 Progress on Upgrade Details 2016-08-13 22:40:33 +01:00
Sam
33cb4db338 Minestrike - Stop vanished players being assigned teams on join 2016-08-12 19:52:23 +01:00
Sam
2915a5e3b9 Add mid-game kit changing NPCs 2016-08-11 21:16:49 +01:00
Sam
69fd78bbf2 Remove Shurikens 2016-08-11 19:05:13 +01:00
Keir Nellyer
a8e891f247 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
 2016-08-11 14:53:57 +01:00
Sam
60a46c8c10 Fire burst is now instant 2016-08-11 14:26:25 +01:00
samczsun
7de9da3d1c Complete rework of disguising and antihack hook 
This commit completely rewrites DisguiseManager, DisguisePlayer, and
PlayerDisguiseManager.

Changes to disguising means that much of the core was also changed,
primarily having to do with mapping by UUID versus player names.

Several new API classes were added, such as EntitySelector, Managers,
UtilTasks, and a brand new scoreboard API which is much more optimized and
allows for much longer lines

The new anticheat is hooked as well, with implementation for guardians
which follow the players around. Release two code is also included, but is
currently disabled via a boolean.
 2016-08-10 21:03:30 -04:00
Sam
82b2541e34 PC-827 
Team SSM - Teammates can no longer cancel each other's Blaze Firefly
 2016-08-10 21:47:13 +01:00
Sam
df646b0659 PC-897 
SG - Spectators can no longer punch fireballs from the world border
 2016-08-10 21:46:37 +01:00
Sam
a02699d84a PC-898 
SSM - Fixes an issue where kit armor would not appear correctly in your
inventory.
 2016-08-10 21:46:02 +01:00
Sam
933861176d PC-662 
Castle Siege - Fixes the game not ending if the whole of one team left.
 2016-08-10 21:45:27 +01:00
Sam
e05f90372a Add kit upgrade details 2016-08-10 19:05:40 +01:00
xGamingDudex
907ac7473f Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698 2016-08-10 16:52:37 +02:00
Sam
87dd4c5632 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple 2016-08-09 20:23:58 +01:00
Sam
c19825cbb0 Remove unused imports 2016-08-09 20:23:50 +01:00
Sam
950a46ad12 Fix Throwable Dirt's velocity 2016-08-09 14:06:39 +01:00
Sam
5fd5245978 Use attack name 2016-08-09 13:07:17 +01:00
Sam
95c23585c8 Missed a file 2016-08-09 12:53:54 +01:00
Sam
acd5e0c1d2 Added minecart colors 2016-08-09 12:53:34 +01:00
Sam
2f3ff052ff Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-08 22:59:55 +01:00
Sam
4c825cf80b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-08 22:48:33 +01:00
Sam
3bab7ffe44 Use attack name for Snowballs and Eggs 2016-08-08 22:48:13 +01:00
Sam
239761962d Now 1.9! 2016-08-08 20:49:24 +01:00
Sam
93e49bc8a6 Stop placing and dropping of skill items 2016-08-08 16:44:13 +01:00
Sam
280ff577fa Metal Kit skill item placing and dropping 2016-08-07 01:25:48 +01:00
Sam
44274bcc64 Projectiles, Enchanted armor & StackOverFlows 
Fixes an issue where players with enchanted armor would cause the server
to frezze for an extended amount of time due to a stackoverflow error
when hit by projectiles such as snowballs or eggs.
 2016-08-07 01:23:03 +01:00
Sam
4173c96d32 Fixes inconsistency with the scoreboard 2016-08-06 23:56:54 +01:00
Sam
691fc309c4 Documentation 2016-08-05 22:11:25 +01:00
Sam
e6bdfe8ba7 Per player fireworks 2016-08-05 22:11:15 +01:00
Keir Nellyer
1854b71757 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-08-05 17:05:01 +01:00
Sam
2c6fc85fee Logic fix and message change 2016-08-04 17:59:28 +01:00
Sam
618a132806 Payload path marker logic change 2016-08-04 17:29:40 +01:00
Sam
24c1e5fc3b Kit items are now unbreakable 2016-08-04 17:29:01 +01:00
Sam
23b7064d43 Island ores bug 2016-08-04 16:56:13 +01:00
Sam
190ced7d97 Metal Kit tweaks 2016-08-04 16:55:52 +01:00
xXVevzZXx
91cf391724 some adjustments to UHC Survivalgames 2016-08-04 00:33:24 -04:00
cnr
3610f78b37 Merge branch 'feature/thanks' into develop 2016-08-03 22:23:46 -04:00
Shaun Bennett
e113bedea5 Fix accidentally refactoring "thanks" in strings 2016-08-03 15:11:31 -05:00
Shaun Bennett
ad6c1dd970 Adjust some text wording 2016-08-03 14:55:33 -05:00
Shaun Bennett
a61906acfa Ignore "Testing" boostergroup when announcing activation 2016-08-03 14:24:49 -05:00
Shaun Bennett
ca13b8f29e Fix compile errors 2016-08-03 14:18:26 -05:00
Shaun Bennett
1ae7f6cb25 Integrate the new ThankManager into Amplifiers 2016-08-03 14:03:12 -05:00
Sam
2b8754aa32 Metal Kit bug fixes 2016-08-02 23:34:12 +01:00
Shaun Bennett
f41cd8c104 Add /thank command. Update jooq files 2016-08-02 00:10:46 -05:00
Sam
62a1968b01 Experimental Metal Kit 2016-08-02 01:13:16 +01:00
Sam
bd00ac8446 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-01 19:34:40 +01:00
Sam
2c37af32ca Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-01 19:19:34 +01:00
Sam
4085453f0f Ninja Dash stopping/not working on rails 2016-08-01 18:47:17 +01:00
Sam
71f9fd97d6 End Effect change 
Reduced the amount of TNT thrown and reduced the velocity at which they
are fired.
 2016-08-01 18:46:35 +01:00
Sam
8f96b15454 Ninja Dash damage radius fix 2016-08-01 17:18:01 +01:00
Sam
84a4aa5157 Reduce Shuriken damage 2016-07-31 13:47:28 +01:00
Sam
1fde433c50 More changes and fixes 2016-07-30 22:53:36 +01:00
Sam
063e05c0f3 Move subtle changes and fixes 2016-07-29 19:07:24 +01:00
Keir Nellyer
bb9dbf1da4 PC-877 Vanish report handler when teleporting to offender's server 2016-07-29 15:08:03 +01:00
cnr
8d0dc0ce08 Merge branch 'feature/party-v2' into develop 2016-07-28 21:19:52 -05:00
LCastr0
ab8d6daa2c GitHub being annoying again 2016-07-28 19:59:49 -03:00
Sam
9b71f8c30b Typo in KitBarrage 2016-07-28 22:49:58 +01:00
Sam
6c11037460 First QA testing session feedback 2016-07-28 22:39:05 +01:00
Sam
771f643b42 Jumping disabled during Pyromancer ULT 2016-07-28 21:01:29 +01:00
Sam
446aec5187 Add "for Team X" when picking up the Arrow powerup 2016-07-28 20:19:50 +01:00
Sam
ba03051689 Add 1 second respawn delay 2016-07-28 19:33:16 +01:00
Sam
d30703c570 Completed game logic & Kit fixes 2016-07-28 19:31:15 +01:00
Shaun Bennett
9c42f4c147 Use the proper boostergroup for amplifier thanks 2016-07-28 13:27:48 -05:00
TadahTech
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
cnr
dd38a1dd76 Merge branch 'update/clans' into develop 2016-07-27 20:40:35 -05:00
cnr
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
Sam
00c0e38b82 Kit upgrades now display 2016-07-27 23:02:40 +01:00
xXVevzZXx
749fa36a5a remove debug and check for Integer class 2016-07-27 16:47:08 -05:00
AlexTheCoder
031a9575ae Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-27 15:13:18 -04:00
xXVevzZXx
43c45f4094 add timer to dragon escape 2016-07-27 13:59:35 -05:00
Sam
8648581140 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-27 19:57:25 +01:00
Sam
ee38cb4c39 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-07-27 19:56:36 +01:00
Sam
888d3fb1aa Payload logic progress 2016-07-27 19:56:31 +01:00
cnr
3cddf35d12 Refactor out legacy ConfirmationPage 2016-07-27 13:52:03 -05:00
cnr
3d0cc2a5fd Refactor Clans gold dependency out of core 2016-07-27 13:52:03 -05:00
cnr
dc96258055 Merge branch 'feature/party-v2' into develop 2016-07-27 13:19:25 -05:00
Shaun Bennett
0d46bc4609 Add Amplifier thank button 2016-07-27 13:17:36 -05:00
xGamingDudex
161381f393 Fixed PC-698 2016-07-27 12:09:59 +02:00
TadahTech
5180e46be7 Revert party chat symbol to "@". Change team chat symbol to "#". 2016-07-24 22:17:50 -05:00
Sam
80eb7b2fd3 Gives Super Arrow on start. 2016-07-24 22:44:50 +01:00
Sam
576b92a5ce Ultimates added to QuiverPayload 2016-07-24 22:06:14 +01:00
Sam
ef797aa599 Velocity fix 2016-07-24 21:41:42 +01:00
Sam
76da92f42e QuiverPayload added 
Basic implementation added
 2016-07-24 21:27:31 +01:00
LCastr0
f4c40c61bb Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-07-24 13:18:53 -03:00
LCastr0
195a82f78f Github is annoying me about this, but I don't know what it is 2016-07-24 13:18:33 -03:00
Sam
a8503d2fb8 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-07-24 11:50:48 +01:00
Sam
4728a50ca9 Small message change 
Avoids using two variables
 2016-07-24 11:49:57 +01:00
TadahTech
ceccf2d2ac Don't give the item when a game is in progress. 2016-07-23 22:36:53 -05:00
Sam
50de769e36 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-24 00:13:13 +01:00
Sam
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
Sam
d3c9957f95 Ultimate length tweaks 2016-07-23 23:43:06 +01:00
Sam
43aae5e076 Ultimate visual and gameplay improvements 2016-07-22 22:47:29 +01:00
Keir Nellyer
c5f3f2b2d6 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-21 22:44:43 +01:00
AlexTheCoder
b87c6cfff0 Fix git removing class 2016-07-21 17:27:41 -04:00
AlexTheCoder
75cc75f40c Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-21 17:25:15 -04:00
AlexTheCoder
4a77a587f8 Fix git removing a class 2016-07-21 16:11:05 -04:00
AlexTheCoder
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
xXVevzZXx
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
Keir Nellyer
9b58c53e90 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-21 16:11:09 +01:00
Sam
faece2c5f8 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-21 11:13:15 +01:00
Sam
f48009d9f8 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-07-21 11:12:23 +01:00
Sam
e7658b4bf2 New kits and upgrades for old kits 2016-07-21 11:05:21 +01:00
AlexTheCoder
e5cd38c11b Revert enjin changes 2016-07-21 05:20:47 -04:00
AlexTheCoder
2615ef74dd Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-21 05:09:54 -04:00
TadahTech
b48f97fd2e Fix stupid JOOQ issue and IntelliJ. 2016-07-21 03:46:18 -05:00
cnr
9a06cce0a0 Merge branch 'feature/party-v2' into develop 2016-07-20 16:41:50 -05:00
TadahTech
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
AlexTheCoder
ff210271c9 Add javadocs 2016-07-20 12:21:15 -04:00
Sam
7e26480452 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-19 22:29:00 +01:00
Sam
3411a3b978 Throwable Dirt colliding issues 
Fixes the falling dirt block colliding with the thrower.
 2016-07-19 22:28:56 +01:00
Sam
8b552a69de Removal of debug message 2016-07-19 21:45:03 +01:00
Sam
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
Sam
7470078da9 Typo in PerkFireBurst 
Should say Blaze Rod instead of Snowblock
 2016-07-19 20:50:19 +01:00
Sam
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
Sam
0390822fd7 IceBridge item no longer droppable 2016-07-19 20:48:36 +01:00
Sam
63a0eebd02 Increased chance enchanted of armour 2016-07-19 20:48:12 +01:00
AlexTheCoder
0eac157701 Implement basketball features in the hub and begin setting up coordinates 2016-07-19 12:45:38 -04:00
AlexTheCoder
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
Keir Nellyer
103f31afc1 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-18 17:17:11 +01:00
xXVevzZXx
370b0693d9 fix the server thinking it's the next week 2016-07-17 05:20:21 -05:00
cnr
0ae4b0c5e0 Temporarily disable anti-xray in UHC 2016-07-16 23:08:18 -05:00
AlexTheCoder
08850d909f Further work on brood mother boss and nether 2016-07-16 21:59:03 -04:00
Sam
e2af4df44b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-16 21:22:57 +01:00
Shaun Bennett
34f718b2ec Fix improper gem/shard reward handling 2016-07-16 06:27:16 -05:00
Sam
30111eb940 Duplicate enchantment fix 2016-07-16 11:16:57 +01:00
Sam
951e07488a GI changes from testing session 2016-07-16 11:15:33 +01:00
Sam
f012e8d4ed Merge from develop 2016-07-16 08:41:15 +01:00
Sam
8523d56bbf Merge fix 2016-07-16 08:33:41 +01:00
Keir Nellyer
6756d04aa7 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-15 23:56:08 +01:00
Sam
d901fce3ac Experimental Skywars Kits 2016-07-15 23:07:17 +01:00
xXVevzZXx
728a91da0f adding damage outsid ethe loop 2016-07-15 04:57:44 +02:00
xXVevzZXx
3070835662 enable armor protection and fix shotguns 2016-07-15 04:39:53 +02:00
xXVevzZXx
6c7f2d8b0d fix damage in DM prepare, eating grenades and no health regen 2016-07-15 02:28:22 +02:00
Keir Nellyer
f0c2686ca7 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-14 23:01:11 +01:00
cnr
a0847b8d1a Fix null ServerGroup uptimes value for MPSes 2016-07-14 08:08:24 -05:00
cnr
1a2e0df6ca Only allow OPs to use minestrike debug commands 2016-07-14 07:28:33 -05:00
cnr
1d1c3ef1be Merge branch 'thanos-mineware' into develop 2016-07-14 03:41:00 -05:00
Thanos Paravantis
40345bc93c Fix Bawk Bawk Battles game start 2016-07-14 11:23:39 +03:00
cnr
7cc44c8bfc Merge branch 'thanos-mineware' into develop 2016-07-14 00:22:01 -05:00
Thanos Paravantis
906762e9db Remove debug commands 2016-07-14 08:17:36 +03:00