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

6715 Commits

Author SHA1 Message Date
Shaun Bennett 699a26f630 Merge pull request #159 in MIN/mineplex from master to feature/dmt-update 
* commit '70d41b074f9256b4ac0b6fb51b68fb24dcf10e24': (328 commits)
  Fix treasure stair orientation
  add a shard queue to DonationManager, use that for TreasureShardReward
  mac fix
  Commons codec is not included in BungeeCord.
  Pooling with later jedis versions doesn't work on Bungee.
  Gitignore redundant Eclipse files.
  Add Eclipse magic.
  Fixed various ways of players going invisible through Spec mode.
  Speed up LobbyBalancer to 500ms
  Add example maven settings.xml
  Remove setTestOnBorrow
  Tone down lobby balancer too.
  Emergency patch to slow down redis player count updates.
  Fixed explosions dropping right items.
  sapling fix
  Update fixes - @Teddy!
  Made block define its own drops.
  Removed an nunnecesarry method
  Fixed items not dropping their regular counterpart.
  Final changes
  ...
 2016-02-03 16:06:59 -06:00
Mysticate af5cf309ca Made sure that a valid tool is used before dropping any items. 2016-02-03 14:43:14 -05:00
NewGarbo c17849b751 fixed some autoboxing stuff 2016-02-03 17:30:07 +00:00
NewGarbo 4e2da061bb added protection around siege weapon 2016-02-03 17:07:06 +00:00
NewGarbo 4488b73e93 change catapult bounding box to 3 2016-02-03 17:02:31 +00:00
NewGarbo 0cb557d922 moved some stuff around and slight changes 2016-02-03 17:02:06 +00:00
NewGarbo 38cae1e3a2 catapult implemented using new siege weapon system, cannons polished up. not tested completely. don't expect this code to work fully haaha 2016-02-03 15:28:53 +00:00
NewGarbo 6bba486385 Added message if cannon is not loaded correctly 2016-02-03 11:20:11 +00:00
NewGarbo d4388870c1 fixed inventory opening on mount 2016-02-03 11:19:33 +00:00
NewGarbo 8004d0dc3c fixed npes 2016-02-03 11:06:58 +00:00
NewGarbo 95741e3029 fixed siege weapon base 2016-02-03 10:53:53 +00:00
phobia 5fd089c768 Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-02-03 17:43:43 +11:00
phobia f011fdad5f Fixes to TntProtection 2016-02-03 15:10:56 +11:00
phobia 0e0582a1a7 Added safe zone protection for flame 2016-02-03 10:39:21 +11:00
NewGarbo 9086188280 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-02-02 22:02:06 +00:00
NewGarbo 6fea76a8e4 finalized alpha patches 2016-02-02 21:38:38 +00:00
NewGarbo 23883148dd alpha fixes 2016-02-02 20:55:23 +00:00
NewGarbo cfbfb1fa3b raised war points for invasion to 25 2016-02-02 20:42:20 +00:00
NewGarbo 9fa5927240 siege weapon base progress 2016-02-02 19:41:25 +00:00
phobia 59e564cdc6 Fixes to war point evasion 2016-02-02 23:18:05 +11:00
Shaun Bennett 70d41b074f Merge pull request #154 in MIN/mineplex from develop to master 
* commit '86917fb1463f018a1f00f80ffd919d1a4afadbb1':
  Fix treasure stair orientation
  add a shard queue to DonationManager, use that for TreasureShardReward
  Fixed various ways of players going invisible through Spec mode.
  Import clean up
  Changed TreasureShard rewarding, removed Queue
  Unused import removed
  Queue speed up
  Debugs removed
  Treasure not giving Shards when dupes occur, fixed.
  Queue implemented for duplicate shard reward
 2016-02-02 05:29:42 -06:00
phobia f1c49fa5ee Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-02-02 22:13:38 +11:00
phobia 8a0f585432 Added fix to WarPoint evasion bug + 1 dmg bug 2016-02-02 22:11:52 +11:00
Shaun Bennett 86917fb146 Fix treasure stair orientation 2016-02-02 05:50:03 -05:00
Shaun Bennett a34ae8cf49 Merge remote-tracking branch 'remotes/origin/master' into develop 2016-02-02 05:37:30 -05:00
Shaun Bennett 0d02f526b6 Merge pull request #116 in MIN/mineplex from bugfix/duplicates to develop 
* commit 'af27944a39129454b2963707c27799643d2440f1':
  add a shard queue to DonationManager, use that for TreasureShardReward
  Import clean up
  Changed TreasureShard rewarding, removed Queue
  Unused import removed
  Queue speed up
  Debugs removed
  Treasure not giving Shards when dupes occur, fixed.
  Queue implemented for duplicate shard reward
 2016-02-02 04:35:44 -06:00
Shaun Bennett af27944a39 add a shard queue to DonationManager, use that for TreasureShardReward 2016-02-02 05:34:33 -05:00
Cheese 610522bdd9 mac fix 2016-02-02 09:25:46 +11:00
Shaun Bennett ee9e26e8ca Merge pull request #149 in MIN/mineplex from bugfix/spectator-infest to develop 
* commit 'ace7d1764c68f6ea679ae60b3104d1af96e1869c':
  Fixed various ways of players going invisible through Spec mode.
 2016-02-01 16:18:23 -06:00
Shaun Bennett 1a9c36d0a1 Merge pull request #153 in MIN/mineplex from master to bugfix/duplicates 
* commit '3a945f190dca9f558cbcb6052b3eaa2816d112b3': (308 commits)
  Commons codec is not included in BungeeCord.
  Pooling with later jedis versions doesn't work on Bungee.
  Gitignore redundant Eclipse files.
  Add Eclipse magic.
  Speed up LobbyBalancer to 500ms
  Add example maven settings.xml
  Remove setTestOnBorrow
  Tone down lobby balancer too.
  Emergency patch to slow down redis player count updates.
  Fixed explosions dropping right items.
  sapling fix
  Update fixes - @Teddy!
  Made block define its own drops.
  Removed an nunnecesarry method
  Fixed items not dropping their regular counterpart.
  Final changes
  Prep for update
  Update CB.jar
  Prevent hearts changing colors in UHC tab.
  Fixed ForTheKing achievement.
  ...
 2016-02-01 15:49:34 -06:00
Virizion 41ea96d505 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-02-01 16:42:55 -05:00
Virizion 989c324a37 Hopper item pickup fix. 2016-02-01 16:18:40 -05:00
Shaun Bennett 3a945f190d Merge pull request #152 in MIN/mineplex from develop to master 
* commit '1e57f19bd605871c2f803741c7dc6f3e7b325647': (229 commits)
  Commons codec is not included in BungeeCord.
  Pooling with later jedis versions doesn't work on Bungee.
  Gitignore redundant Eclipse files.
  Add Eclipse magic.
  Speed up LobbyBalancer to 500ms
  Add example maven settings.xml
  Remove setTestOnBorrow
  Tone down lobby balancer too.
  Emergency patch to slow down redis player count updates.
  Fixed explosions dropping right items.
  sapling fix
  Update fixes - @Teddy!
  Made block define its own drops.
  Removed an nunnecesarry method
  Fixed items not dropping their regular counterpart.
  Final changes
  Prep for update
  Update CB.jar
  Prevent hearts changing colors in UHC tab.
  Fixed ForTheKing achievement.
  ...
 2016-02-01 15:13:19 -06:00
NewGarbo 04ec8a6a26 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 
Conflicts:
	Plugins/pom.xml
 2016-02-01 20:10:51 +00:00
NewGarbo 84b887fe89 that's not needed 2016-02-01 19:53:59 +00:00
NewGarbo b4ed912f7d siege weapon modular system beginnings 2016-02-01 19:52:53 +00:00
md_5 1e57f19bd6 Commons codec is not included in BungeeCord. 2016-02-01 18:18:23 +11:00
md_5 e887bbf543 Pooling with later jedis versions doesn't work on Bungee. 2016-02-01 18:13:50 +11:00
md_5 509e0609c1 Gitignore redundant Eclipse files. 2016-02-01 10:34:11 +11:00
md_5 cc1ecbe0b8 Add Eclipse magic. 2016-02-01 10:24:49 +11:00
NewGarbo 45aacd626e this isn't used anymore 2016-01-31 19:20:15 +00:00
NewGarbo cc857da88e Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
 2016-01-31 16:27:14 +00:00
NewGarbo 002be01ef1 MAVEN TEST COMMIT 2016-01-31 16:21:04 +00:00
NewGarbo a5439943d6 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-31 15:47:52 +00:00
Mysticate ace7d1764c Fixed various ways of players going invisible through Spec mode. 2016-01-31 10:22:59 -05:00
md_5 852f96a314 Speed up LobbyBalancer to 500ms 2016-01-31 09:45:34 +11:00
md_5 478b92db44 Add example maven settings.xml 2016-01-31 09:44:46 +11:00
Shaun Bennett b9354b7972 Remove setTestOnBorrow 2016-01-30 16:10:30 -05:00
phobia 9c83c64d01 Fixed issues with Broadsword 
Added max building height of 100
 2016-01-30 21:34:06 +11:00
phobia 4612550ba5 Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-01-30 19:24:42 +11:00