Commit Graph

10429 Commits

Author SHA1 Message Date
Kenny
26c772b8b8 Merge branch '2xXP' into develop 2017-04-29 02:19:40 -04:00
Kenny
20264ff1af Clans doesn't have access to this through core for some reason 2017-04-29 02:17:50 -04:00
Kenny
7994ed082e Enable 2x XP 2017-04-29 02:16:31 -04:00
Kenny
f5cba1eb1e Rate limit book/sign edits as a temporary measure against a crash exploit 2017-04-29 02:05:07 -04:00
LCastr0
1879a92261 Changed to items... 2017-04-29 01:03:30 -03:00
LCastr0
146274001f Fix height (again) 2017-04-28 22:32:40 -03:00
LCastr0
25adf3fa33 Fix height 2017-04-28 22:04:00 -03:00
LCastr0
0a1a5eae7a Changed arrow to armor stand 2017-04-28 21:37:39 -03:00
LCastr0
f8566437d5 Fixed shimmering rings 2017-04-28 21:23:19 -03:00
LCastr0
df563793c5 Fixed name 2017-04-28 13:25:10 -03:00
LCastr0
adef8945a4 Disable other gadgets before enabling 2017-04-28 13:20:25 -03:00
LCastr0
c1f06595bb Fix NPE 2017-04-28 13:17:00 -03:00
LCastr0
1b686a1446 Shimmering Ring kit selector 2017-04-28 11:43:13 -03:00
LCastr0
89f47d4c6c Rain Cloud selector 2017-04-28 11:20:27 -03:00
LCastr0
42e4564a25 Rainbow Dance selector 2017-04-28 11:14:22 -03:00
LCastr0
e9d1ac85f1 Changed single-type particle to an enum, added love particles 2017-04-28 01:46:26 -03:00
LCastr0
ae8b348264 Ember Kit selector 2017-04-28 01:37:27 -03:00
LCastr0
1000c190a2 Fixed Y offset for Water Wings and added Flames of Fury and Halo effects 2017-04-28 00:32:29 -03:00
LCastr0
494fd4787c Skip disabling kit selectors between game restarts 2017-04-27 23:53:37 -03:00
LCastr0
073bc2eea7 Update hologram when player claims peasant 2017-04-27 21:18:12 -03:00
LCastr0
55f85966c1 Fixed arrow location 2017-04-27 21:17:05 -03:00
LCastr0
99363d9af5 Lore 2017-04-27 21:06:35 -03:00
LCastr0
16e9263874 Lets the player sit on the throne 2017-04-27 21:05:03 -03:00
LCastr0
d62d9a813b Javadocs 2017-04-27 20:55:21 -03:00
LCastr0
601c9e31c6 Updated hologram to display the amount of peasants in the kingdom 2017-04-27 20:54:49 -03:00
LCastr0
f1670bc550 Increase the height of the crown 2017-04-27 20:33:31 -03:00
LCastr0
e7c270847b Fixed message, and no longer updates without needing 2017-04-27 20:32:46 -03:00
LCastr0
e45e3be4e8 Added first kit selector 2017-04-27 20:01:29 -03:00
LCastr0
95f50604c0 Fixed colors 2017-04-27 18:29:55 -03:00
LCastr0
2615cd6add Fixed locations 2017-04-27 16:56:06 -03:00
LCastr0
d33aac9fd4 Fixed args 2017-04-27 16:34:35 -03:00
LCastr0
246c0c1788 Added wools to the top of the castle 2017-04-27 16:28:09 -03:00
LCastr0
5d5bc2d847 Reverted removal of fountain 2017-04-27 16:06:23 -03:00
LCastr0
6a8cecad27 Javadocs 2017-04-27 15:43:55 -03:00
LCastr0
0942942f5a Changed messages 2017-04-27 15:43:31 -03:00
LCastr0
2e476226fd Javadocs for CastleManager 2017-04-27 15:16:34 -03:00
LCastr0
02785d5dfd Moved everything to CastleManager, changed to rightclick 2017-04-27 15:12:33 -03:00
LCastr0
124d22ce31 Added new class for peasants 2017-04-26 22:52:40 -03:00
Sam
90d173551d Fix not lobby gem duping 2017-04-26 21:56:01 +01:00
LCastr0
6bf1b6c1dc Fixed arguments 2017-04-26 16:25:32 -03:00
LCastr0
4dfd1b3d21 Check for active gadgets while playing the particle 2017-04-26 16:22:24 -03:00
LCastr0
5764a4bce3 Added gadget class 2017-04-26 14:34:41 -03:00
LCastr0
01076ec054 Kit selector, not rank selector... 2017-04-26 14:10:49 -03:00
LCastr0
1855cfc4ed Added new gadget type 2017-04-26 13:58:30 -03:00
LCastr0
25487ad0b1 Fix message prefix 2017-04-26 11:17:03 -03:00
LCastr0
fb03e9adec Respawn holograms since setText doesn't work, and actually send the correct information to the event 2017-04-26 11:14:43 -03:00
LCastr0
56f19ec937 Null checker 2017-04-26 01:39:26 -03:00
LCastr0
6145d9f87d Lower the hologram a bit 2017-04-26 01:35:11 -03:00
LCastr0
9796b5acba Actually check if its a hub and start the hologram 2017-04-26 01:26:01 -03:00
LCastr0
19138eb501 Added castle stuff for hub 2017-04-26 01:12:43 -03:00
LCastr0
d36b44e32d Removed fountain in my code so I can test the castle 2017-04-25 12:12:51 -03:00
LCastr0
12f7659195 Added king particle 2017-04-25 00:16:32 -03:00
Sam
82db46c1e6 Displayname fix 2017-04-21 22:52:34 +01:00
Sam
f9c98ccf8c Fix persistence? 2017-04-21 20:05:43 +01:00
Sam
ac3c1c3ebb Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-21 17:42:46 +01:00
cnr
87b829b411 Disable easter egg baskets in games 2017-04-19 22:33:32 -07:00
cnr
ffdbebf3ee Prevent players from purchasing St Patricks Chests 2017-04-19 22:32:21 -07:00
cnr
6bf6725616 Commit missed conflict resolution 2017-04-18 01:40:09 -07:00
LCastr0
61409d0bfe Possible fix for duplicated items in some chests 2017-04-18 01:37:27 -07:00
Alexander Meech
bc38d895a0 Update CUST-1 to track Spring Chests 2017-04-16 16:53:18 -04:00
cnr
2263e8bfcb Ignore movement checks in Runner 2017-04-16 01:09:12 -06:00
cnr
dad00171a7 Clean up 'banwave' logic 2017-04-16 00:49:12 -06:00
cnr
56e15ab2d9 Add Skyfall teams to game menu 2017-04-14 23:11:15 -06:00
cnr
2baaf4664e Fix UHC and Skyfall player counts 2017-04-14 22:39:06 -06:00
LCastr0
09dc7edaad Added Spring chest to title trackers 2017-04-14 22:34:50 -06:00
cnr
b30a706543 Disable Skyfall booster kit 2017-04-14 22:33:54 -06:00
cnr
c7e855ee16 Merge branch 'feature/eastereggs' into develop 2017-04-13 22:56:41 -06:00
cnr
7e7ac95ccb Change Skyfall stats icon to diamond boots 2017-04-13 20:47:19 -06:00
cnr
bc80b21372 Update skyfall in the game selector 2017-04-13 20:44:33 -06:00
cnr
732d2cbeb8 Bump VL bounds for KillAura type A 2017-04-13 18:03:08 -06:00
cnr
8cbf8e8f1e Bump lower bound for Reach VL 2017-04-13 14:41:38 -06:00
cnr
ff3dbe5d93 Add missing AutoSneak ban 2017-04-13 13:30:53 -06:00
cnr
4e82233871 Make no-op thresholds a true no-op 2017-04-13 02:42:35 -06:00
cnr
5c5a368ebe Only register HeadRoll action once 2017-04-13 01:19:30 -06:00
Kenny
ac7492152a Fix average TPS reporting 2017-04-13 01:16:57 -06:00
samczsun
498df70a1f Implement basic canDamage 2017-04-13 00:02:32 -06:00
cnr
0735b415cf Implement new MineplexLink methods 2017-04-13 00:00:17 -06:00
cnr
490fe56b34 Merge branch 'update/skyfall-nolag' into develop 2017-04-12 23:39:01 -06:00
cnr
87f9fe6093 Implement anticheat VL and banwave changes 2017-04-12 23:36:55 -06:00
cnr
0dae58a0a7 Bump anticheat dependency version 2017-04-12 23:18:44 -06:00
samczsun
e1fee19aff Optimize chunk updating and fix invis players 2017-04-13 01:09:05 -04:00
cnr
da5df8dae2 Merge remote-tracking branch 'update/aprilchest' into develop 2017-04-12 23:03:47 -06:00
Alexander Meech
176107c848 Update the setup of CUST-1
Should probably make this dynamic at some point......
2017-04-12 23:02:53 -06:00
Kenny
cd7948c039 Report server TPS average to ServerMonitor rather than what it happens to be at that moment
This (should) fix instances of servermonitor flagging a server as lagging and killing it for short bursts of high CPU usage
2017-04-12 23:02:13 -06:00
Sarah
4775fccb9a Improve Island rot and misc fixes 2017-04-12 22:35:33 +02:00
AlexTheCoder
5a225b9332 Properly check the spring chest rewards 2017-04-12 16:01:24 -04:00
AlexTheCoder
fe1cda820f Merge branch 'update/aprilchest' of github.com:Mineplex-LLC/Minecraft-PC into feature/eastereggs 2017-04-12 16:00:37 -04:00
AlexTheCoder
c3ff494f94 Update Arcade and Hub to use skinned easter eggs 2017-04-12 03:06:32 -04:00
AlexTheCoder
f3e6c44d9b Fix a bunch of bugs and switch to a block based egg hunt. Additionally, move some location constants to match the Easter Lobby. 2017-04-11 22:24:50 -04:00
LCastr0
1904990f84 Fixed merging issues 2017-04-11 23:16:42 -03:00
LCastr0
b511546b36 Removed age lock from zombie 2017-04-11 22:44:56 -03:00
AlexTheCoder
9a58cd792e Implement easter egg baskets in games which can give fantastic rewards 2017-04-11 20:18:09 -04:00
AlexTheCoder
2d61dffaea Implement an easter egg hunt of epic proportions 2017-04-11 19:57:10 -04:00
LCastr0
0a51bcd607 Easter, not eater 2017-04-11 16:10:59 -03:00
Sam
914de58dbc World Event bug fixes 2017-04-09 16:01:44 +01:00
LCastr0
4388a7f70e Changed lenght (missed one thing) 2017-04-08 23:17:39 -03:00
LCastr0
7db5805f16 Fixed lenght 2017-04-08 23:11:41 -03:00
LCastr0
de46f2db70 Should have been added in the last commit 2017-04-08 23:09:10 -03:00
LCastr0
6f1c062182 Removed GameType, using GameDisplay instead 2017-04-08 23:06:55 -03:00
LCastr0
1f0a22eb94 Stops balloons from 'growing up' 2017-04-08 22:58:14 -03:00
LCastr0
e4fc53d5ce Removed flower trail from games 2017-04-07 17:46:53 -03:00
LCastr0
8bcb5bc948 Added event to be called when game stops 2017-04-07 14:13:53 -03:00
LCastr0
b441dc5edf Calls event when arcade game starts 2017-04-07 14:12:23 -03:00
LCastr0
30215aea40 Added docs 2017-04-07 14:08:12 -03:00
LCastr0
6a668004e0 Added game start event to core, to be called inside arcade and handled inside core 2017-04-07 14:06:44 -03:00
LCastr0
45e3223962 Added effects to chets opening and changed flowers to leaves so they don't drop any items when removed 2017-04-07 14:02:30 -03:00
samczsun
daaea03be7 Strict username validation 2017-04-06 15:21:56 -04:00
Sam
5c00ca712f Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-06 18:20:41 +01:00
Sam
f14bde9d30 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-06 11:56:59 +01:00
Sam
08bd17afe6 Fix a chat formatting problem 2017-04-06 00:36:17 -05:00
samczsun
0cc7a078c6 Fix bad logic in TeamArmorModule 2017-04-06 00:35:49 -05:00
samczsun
36f4e6b5a1 Change more closeInventory calls 2017-04-06 00:35:49 -05:00
samczsun
8e92317b9c So that's why Tim closed inventories 2017-04-06 00:35:49 -05:00
samczsun
9c9d74f098 PC-1394 2017-04-06 00:35:49 -05:00
samczsun
be1e454d5c PC-696 2017-04-06 00:35:49 -05:00
samczsun
fceda64a5a PC-1318 2017-04-06 00:35:49 -05:00
samczsun
d69c4b3dca PC-1189 2017-04-06 00:35:49 -05:00
samczsun
bd1d73d390 PC-1181 2017-04-06 00:35:49 -05:00
samczsun
4553a7081f PC-697 PC-1180 2017-04-06 00:35:49 -05:00
samczsun
40860ef9a2 PC-1107 2017-04-06 00:34:34 -05:00
samczsun
e0706f3627 PC-1056 2017-04-06 00:34:34 -05:00
samczsun
db59c32b5e PC-1028 2017-04-06 00:34:34 -05:00
samczsun
422bbcce2c PC-1025 2017-04-06 00:34:34 -05:00
samczsun
a97ba5d1fd PC-941 2017-04-06 00:34:34 -05:00
samczsun
f03df67219 PC-830 2017-04-06 00:34:34 -05:00
samczsun
873cd9c2a5 PC-802 2017-04-06 00:34:34 -05:00
samczsun
4f77413523 PC-265 2017-04-06 00:34:34 -05:00
cnr
a1fc6bd20f Merge remote-tracking branch 'bugfix/bridges' into develop 2017-04-06 00:33:47 -05:00
cnr
64d5fe3c80 Revert "Revert "Merge branch update/bridges into develop""
This reverts commit 0ad69ebefc.
2017-04-06 00:33:41 -05:00
LCastr0
888c26c12d Changed icon of bunny pet 2017-04-05 19:03:12 -03:00
Sam
cbf7985773 Colour the message 2017-04-05 22:58:06 +01:00
Sam
c1b83b1065 Braces 2017-04-05 21:46:22 +01:00
Sam
047ed81eea Add a message when a player dies pregame 2017-04-05 21:38:04 +01:00
Sam
1f1ad4c441 Change Diamond ore drops to diamonds 2017-04-05 21:35:04 +01:00
Sam
4552fc2e9b Fix loot module NPE 2017-04-05 21:14:12 +01:00
Sarah
acd588ff1a Add lucky/unlucky tracks to Skyfall 2017-04-05 04:40:52 +02:00
Sarah
e4b79a3731 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Island.java
2017-04-05 04:21:14 +02:00
Sarah
616e2dad0f Fix selection of air blocks when searching for top layer blocks
add some Supply Drop loot
dd /Boost command, fix AntiCheat
don't put duplicates in supply drop
don't crumble rings before the game begins
don't crumble middle rings
2017-04-05 04:15:48 +02:00
LCastr0
27d7226712 Fixed flowers dropping after chest is opened 2017-04-04 22:58:43 -03:00
LCastr0
cb5b0a3c83 Changed the icon of the death effect 2017-04-04 18:00:47 -03:00
LCastr0
2c09bb584a Fixed Spring Set lore 2017-04-04 17:33:02 -03:00
LCastr0
424e0fe0a4 Fixed spring chests being purchasable even if locked or if player had all the items 2017-04-04 17:29:45 -03:00
LCastr0
957004f97a Added 'Found in X' lore 2017-04-04 17:28:11 -03:00
LCastr0
83d141eddc Changed price of Spring Halo particle 2017-04-04 17:25:16 -03:00
LCastr0
a7be020c9d Locked rabbit as adult 2017-04-04 17:23:43 -03:00
Sam
b85214c7f0 Fix the "wooden pillar" bug with supply drops 2017-04-04 21:12:39 +01:00
LCastr0
3bc4125b76 Removed custom pet from this update 2017-04-04 15:47:02 -03:00
Sam
9ad8e18175 More persistence senanagins 2017-04-03 20:16:03 +01:00
Sam
b86ad77e0b Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-02 12:53:40 +01:00
Sam
bc1050e387 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence 2017-04-02 12:48:35 +01:00
cnr
6534561893 Disable April Fools manager 2017-04-01 23:59:47 -05:00
samczsun
ef21106da0 Fix memory leak in CompassModule 2017-04-01 16:20:59 -05:00
Sam
b88f9fc642 Change the skin to Topplemop 2017-04-01 02:11:11 -05:00
Sam
6adc1b265d Missed a file... 2017-04-01 02:11:11 -05:00
Sam
5bba8d2a5b Show how many they have found when clicking on a head 2017-04-01 02:11:11 -05:00
Sam
80eb8db8e2 Remove unused global variable 2017-04-01 02:11:11 -05:00
Sam
e71bab8cea Use a better DB schema 2017-04-01 02:11:11 -05:00
Sam
da29654807 April Fools Treasure Hunt 2017-04-01 02:11:11 -05:00
Sam
bd841762d1 Run skin getting on the main thread 2017-04-01 02:11:11 -05:00
Sam
016860b615 Replace NPCs with Pirates 2017-04-01 02:11:11 -05:00
Sam
4053e43964 Add a manual toggle 2017-04-01 02:11:11 -05:00
Sam
4b22355348 Add more fun stuff 2017-04-01 02:11:11 -05:00
Sam
52323f6119 Add more replacement words 2017-04-01 02:11:11 -05:00
Sam
e74486c1bc Add even more priate speak 2017-04-01 02:11:11 -05:00
Sam
4c882ae4a8 Fix chat handling elsewhere 2017-04-01 02:11:11 -05:00
Sam
66cea341a5 Use regex and remove "g" 2017-04-01 02:11:11 -05:00
Sam
03d781ca70 It be April fools matey, walk yee plank 2017-04-01 02:11:11 -05:00
Sam
4947b01f93 Convert itemstacks to craftbukkit versions 2017-03-31 20:24:45 +01:00
cnr
850b7b1aad Merge remote-tracking branch 'update/aprilppc' into develop 2017-03-31 00:50:55 -05:00
Alexander Meech
10a1f71558 Add RustyDawgT to featured creators 2017-03-31 00:50:14 -05:00
LCastr0
ed39d5daa7 Reverted rename 2017-03-31 01:16:30 -03:00
LCastr0
911d5d20d2 Reverted rename 2017-03-31 01:07:00 -03:00
LCastr0
e8d6c321cd Merge branch 'develop' into update/aprilppc 2017-03-31 00:40:38 -03:00
samczsun
4d32efe779 Not even disguises are safe from the NSA 2017-03-29 23:31:12 -05:00
samczsun
c8eab2596f Move package because intellij is complaining 2017-03-29 23:31:12 -05:00
samczsun
c82697a4e3 PC-1396 2017-03-29 23:30:49 -05:00
samczsun
affb2cb91f PC-1395
Don't disable self otherwise a message is shown
2017-03-29 23:30:49 -05:00
samczsun
017d737e59 PC-1248 PC-1249 2017-03-29 23:30:49 -05:00
samczsun
53e8fa9c47 PC-1235 2017-03-29 23:30:49 -05:00
samczsun
52f09655e8 PC-1231 2017-03-29 23:30:49 -05:00
samczsun
53d9a5f977 PC-1222 2017-03-29 23:30:49 -05:00
samczsun
63eed1abcd PC-1210 2017-03-29 23:30:49 -05:00
samczsun
cb33bc7bed PC-1187 2017-03-29 23:30:49 -05:00
samczsun
fc686ea497 PC-1182 2017-03-29 23:30:49 -05:00
samczsun
40648cf715 PC-1178 2017-03-29 23:30:49 -05:00
samczsun
ca452463db PC-1106 2017-03-29 23:30:49 -05:00
samczsun
3ef8c6f532 PC-1101 2017-03-29 23:30:49 -05:00
samczsun
8226592caa PC-1026 2017-03-29 23:30:49 -05:00
samczsun
8a78f1ce34 PC-1026 2017-03-29 23:30:49 -05:00
samczsun
858b08e3c3 PC-825 2017-03-29 23:30:49 -05:00
samczsun
8521691cfb PC-817 2017-03-29 23:30:49 -05:00
samczsun
c95fea066c PC-778 2017-03-29 23:30:49 -05:00
samczsun
4ad5cede14 PC-740 2017-03-29 23:30:49 -05:00
samczsun
23c52eed2c PC-729 2017-03-29 23:30:49 -05:00
samczsun
3b8bda9dbd PC-728 2017-03-29 23:30:49 -05:00
samczsun
e45e27ba34 PC-629 2017-03-29 23:30:49 -05:00
samczsun
99534e19c5 PC-599 2017-03-29 23:30:49 -05:00
samczsun
66e3a7ad5c PC-587 2017-03-29 23:30:49 -05:00
samczsun
9256fe9903 PC-401 2017-03-29 23:30:49 -05:00
samczsun
1ecd46f7ee PC-372 2017-03-29 23:30:49 -05:00