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

4783 Commits

Author SHA1 Message Date
NewGarbo e28059848c New 1.7 leaves fix for UtilBlock#getHighest() 2015-11-15 08:51:59 +00:00
NewGarbo 1398987ff7 Removed currently unused world event types. 2015-11-15 08:49:44 +00:00
NewGarbo 321d840cfd Throwing RuntimeException instead of legacy assert expression. 2015-11-15 08:28:57 +00:00
Shaun Bennett f90b137ccd Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-14 16:46:03 -05:00
NewGarbo e4981c7491 Undead camp finishing stuff 2015-11-14 20:30:37 +00:00
Shaun Bennett 487f974951 Clan Gui updates and code cleanup 2015-11-13 23:53:34 -05:00
NewGarbo 8a972075da Formatted WorldEventManager (seperate commit for formatting so that confusion doesn't arise in future commits) 2015-11-13 21:19:50 +00:00
NewGarbo a0ac15dec5 Allowed Jr.Devs to start/clear world events. 2015-11-13 21:01:09 +00:00
NewGarbo 98be3a51a0 Added a Speed I effect to the UndeadWarrior and UndeadArcher creatures that spawn in the UndeadCamp world event. 2015-11-13 21:00:08 +00:00
NewGarbo 010f30f064 Made the alpha login message only send one (forgot to save the task manager stuff) 2015-11-13 20:57:33 +00:00
Shaun Bennett 8ba9a8f6c4 Fix border radius 2015-11-12 22:38:26 -05:00
Shaun Bennett 40138b6914 1.8 fix 2015-11-12 22:35:56 -05:00
Shaun Bennett f3e94cc035 Map fix (probably broken?!) 2015-11-12 21:35:01 -05:00
Shaun Bennett bbc7bf770c 1.8 Fixes - Still doing map fix 2015-11-12 19:18:42 -05:00
Shaun Bennett 639d2d110f Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-11-12 17:55:33 -05:00
Shaun Bennett c4e188296a Fix compiler and misc 2015-11-12 17:55:00 -05:00
Shaun Bennett 0b41450603 Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" 
This reverts commit 6c17b2926c.
 2015-11-12 17:51:13 -05:00
Shaun Bennett 6c17b2926c Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta" 
This reverts commit ce1c09b88f, reversing
changes made to 1aef7fe0b9.
 2015-11-12 16:35:31 -05:00
Shaun Bennett 875c399c9f Merge branch 'master' into clans-beta 2015-11-11 21:31:03 -05:00
Shaun Bennett 33680e829a Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-11 21:25:32 -05:00
libraryaddict 25f299b490 Fix interact types 2015-11-12 14:34:12 +13:00
Shaun Bennett e66bebcfb1 Give all treaure items when opening the chest 2015-11-11 18:13:47 -05:00
Shaun Bennett 994a9e3e43 Clans Gui Work, commiting so I can switch branches 2015-11-11 18:05:48 -05:00
NewGarbo ce1c09b88f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
	Plugins/Libraries/craftbukkit.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
 2015-11-11 19:35:44 +00:00
libraryaddict ba7515f761 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-11-12 04:27:17 +13:00
libraryaddict b915131407 Fix some armorstands and interaction bugs 2015-11-12 04:26:55 +13:00
Jonathan Williams 27ef2c0bbb Fixed UtilEnt.Leash method. 2015-11-11 04:36:10 -06:00
Jonathan Williams 0e6146d5c9 Added expire to Stacker throw. 2015-11-11 04:32:56 -06:00
libraryaddict 3e6d73221b Disabled a fix 2015-11-11 15:21:17 +13:00
Cheese 4dd9b0967a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-11 12:50:07 +11:00
Cheese a47752cfe2 disabled usage of /minecraft: commands in 1..8 2015-11-11 12:49:19 +11:00
libraryaddict ee286c2676 Disable /minecraft commands 2015-11-11 13:49:06 +13:00
libraryaddict 7559d1feb5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-11-11 11:45:40 +13:00
libraryaddict f18c55cbd9 Fix schedulers 2015-11-11 11:45:17 +13:00
Cheese 4eaa165826 such format 2015-11-11 07:54:13 +11:00
Cheese b3125e40ff Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-11 07:43:01 +11:00
libraryaddict 6983af944f Fix a craftbukkit bug 2015-11-11 00:25:20 +13:00
libraryaddict 37fdf53a51 Fixed champion's Illusion crash 2015-11-11 00:21:28 +13:00
libraryaddict 1a2c163ce2 Fix scoreboard out of bounds error 2015-11-11 00:03:08 +13:00
Jonathan Williams 6e90052480 Updated StaffServer to 1.8 2015-11-10 02:01:39 -06:00
Cheese 0a9c97c32a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-10 18:05:01 +11:00
Shaun Bennett 2707173a8b Merge with 1.8 Branch 2015-11-10 01:48:33 -05:00
Cheese 83248a8fec Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-10 09:11:27 +11:00
Cheese 0ae5330634 squid changes 2015-11-10 09:11:10 +11:00
NewGarbo 1aef7fe0b9 bunch of fixes reported by qa in tutorials. 2015-11-09 20:46:38 +00:00
NewGarbo f1fbe086d3 oh how fun, even more constructor errors! 2015-11-09 20:29:52 +00:00
NewGarbo af6e28f14b don't you worry Shaun, I gotcha back with fixing them constructor problems ;) 2015-11-09 20:29:27 +00:00
NewGarbo c6ff845efa arcade weird thingy 2015-11-09 20:28:41 +00:00
Shaun Bennett 8850737f71 Fix constructor issues 2015-11-09 15:22:15 -05:00
Shaun Bennett 0bb3f8adb1 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 
# Conflicts:
#	Plugins/.idea/dataSources.xml
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
 2015-11-09 14:41:16 -05:00
Shaun Bennett 610b5dbeb2 More work on gui 2015-11-09 14:39:52 -05:00
Jonathan Williams 5c89124eb6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-09 03:25:02 -06:00
Jonathan Williams ba7d5bbcdc Fixed Arcade! 2015-11-09 03:24:20 -06:00
Shaun Bennett ec3427bcc0 Giveaway manager bug fix 2015-11-09 04:08:26 -05:00
NewGarbo 7a8a5918c0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/dataSources.xml
	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java

** CONFLICTS ALL FIXED **
 2015-11-09 08:59:37 +00:00
Shaun Bennett 05b52614fe Forgot to remove debug code for testing 2015-11-09 03:49:12 -05:00
NewGarbo 0409d7ffef Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-09 08:48:12 +00:00
NewGarbo 4232a5675f fixed bug with part 5 of the getting started tutorial (has to do with claiming events) 2015-11-09 08:45:34 +00:00
NewGarbo 8f507c4b9c typo 2015-11-09 08:29:51 +00:00
Shaun Bennett 2eaa326929 Merge remote-tracking branch 'origin/master' 2015-11-09 03:27:50 -05:00
Shaun Bennett 2c54e9e59a Giveaway extras 2015-11-09 03:27:42 -05:00
Jonathan Williams fb4978305f Fixed up EnjinTranslator 
Added extra overload for inventoryManager if you have the accountId already.
 2015-11-09 02:26:45 -06:00
Shaun Bennett 2a7b272de3 Merge remote-tracking branch 'origin/master' 2015-11-09 01:55:36 -05:00
Jonathan Williams 283a774e03 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-09 00:04:55 -06:00
Jonathan Williams 4915ebc5ad Added Purchase logging manager for Enjin. 
Added extra callback method for SaveRank.
 2015-11-09 00:04:38 -06:00
Jonathan Williams ff936784d3 Remove debug code. 2015-11-08 17:27:00 -06:00
Jonathan Williams e86623c8d0 Disabled TrickOrTreatManager to test for Lobby lockups. 2015-11-08 17:26:43 -06:00
Jonathan Williams fd3ccf7ce0 Fix Bungee lobby balancer code. 2015-11-08 17:25:54 -06:00
libraryaddict d466005c35 Fix custom names not changing 2015-11-09 05:08:08 +13:00
libraryaddict 752d8152d2 Merge pull request #72 in MIN/mineplex from iKeirNez_Bugfix to master 
* commit '783bec75db7592dc191698b8dfbb89be08a818aa':
  Fix for some preferences not applying correctly.
 2015-11-08 08:23:20 -06:00
libraryaddict 1999e09e69 Update CB 2015-11-09 02:44:16 +13:00
libraryaddict ce3af6cf9c Update cb.jar 2015-11-09 00:15:28 +13:00
libraryaddict e039f2249c Update cb 2015-11-08 18:02:36 +13:00
libraryaddict c4d6bcba02 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-11-08 17:56:34 +13:00
Shaun Bennett 3c82574386 Testing pushing/ignore this 2015-11-07 20:02:07 -05:00
Shaun Bennett ffc389f9c7 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-07 19:58:12 -05:00
Shaun Bennett af1d91913b Clans gui work 2015-11-07 19:58:03 -05:00
NewGarbo 9a70d33b17 Fixed clans user directory being wrong on test servers (because a backslash ['\'] is not seperator for certain OS). Changed /gear command rank back to Admin, and added assassin armor to the gear GUI. 2015-11-07 20:26:43 +00:00
Shaun Bennett addde570bb Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-07 14:53:35 -05:00
Shaun Bennett bf97cf5d77 Remove debug code 2015-11-07 13:53:34 -05:00
libraryaddict 79d0466355 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2015-11-07 21:36:36 +13:00
libraryaddict 627ce08113 Add info on note particle 2015-11-07 21:35:26 +13:00
Shaun Bennett e1f56a5d5a Merge remote-tracking branch 'origin/master' 2015-11-07 01:10:34 -05:00
Shaun Bennett ec7600a4a2 Giveaway tweaks 2015-11-07 01:10:27 -05:00
Cheese c922c3248c disabled trick or treat 2015-11-07 13:36:16 +11:00
Cheese f4bf685e96 removed halloween hub 
removed titan giveaway and pumpkins
 2015-11-07 13:20:29 +11:00
Shaun Bennett 4add7449eb Merge remote-tracking branch 'origin/master' 2015-11-06 21:15:45 -05:00
Shaun Bennett 3893617d58 Logitech Giveaway (still needs testing) 2015-11-06 21:15:37 -05:00
Keir 783bec75db Fix for some preferences not applying correctly. 2015-11-06 23:04:51 +00:00
libraryaddict d3d448ccfe Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-11-07 04:47:37 +13:00
libraryaddict cc0f12f6c8 Fix player interactions packets not working properly on armorstand and when clicking block behind entity 2015-11-07 04:45:02 +13:00
NewGarbo b835823230 Preferences page changes to free up space, as the current preferences layout is completely full. 
Removed unnecessary Spawn variable in Clans.java, as it was causing a warning and warnings look ugly.
 2015-11-06 13:19:02 +00:00
NewGarbo 7675b00999 Dominance event. Shaun will have to call the new events once he's done with Dominance. 2015-11-06 07:11:06 +00:00
NewGarbo 1375623625 Added alpha messages. 2015-11-04 17:03:52 +00:00
libraryaddict 77125b3a24 Don't re-set scoreboard lines 2015-11-05 01:10:08 +13:00
libraryaddict 31b4fbec15 Fix a null 2015-11-05 00:49:26 +13:00
libraryaddict 0352e52a68 Tentative beginnings of wider scoreboards 2015-11-05 00:42:45 +13:00
NewGarbo 3ff044fddb Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips 2015-11-04 11:32:06 +00:00
libraryaddict a0676b7bcf Fix tnt in SG being usable during DM invul 2015-11-04 21:44:10 +13:00
libraryaddict 21d10e4bec Fix typo 2015-11-04 19:15:06 +13:00