Cheese
ee237c9f5b
re-enabled SG in gamefactory
2015-03-17 22:20:40 +11:00
libraryaddict
5718df4fb5
Merge pull request #14 in MIN/mineplex from SurvivalGames to master
...
* commit '1f0e204eb30599e711eaddc12fac5956dc0677b5':
Update SurvivalGames
Allow disabling of game start sounds, and changing of the game PrepareTime.
SG kit fletcher no longer can pickup fletched arrows
Remove SG wolf pet on quit
Add new loot classes to manage loot
Change wizards spells to use conditions for potion effects
Don't allow people holding gold ingots to deal a lot of damage
Update disguises for 1.8, add sleeping ability to player disguises
Add border packet and resource pack status packet. Add ability to listen to incoming packet Use Entity
No longer need to constantly set the durability of items in the sheep game
Add relative teleports to /teleport command
Add Wither to ConditionFactory
Fixed GameScoreboard demanding strings are shortened to 15 chars when the max is 16
Formatted SpellType, fixed lightning spell description
Change UtilPlayer.sendPacket(Packet) to UtilPlayer.sendPacket(Packet...)
Fixed UtilTime for displaying decimals when trimmed
Change Blood to unstackable items
Add method getEntityById to UtilEnt
2015-03-17 06:11:54 -05:00
libraryaddict
1f0e204eb3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/subclasses/HealingRune.java
2015-03-18 00:04:41 +13:00
libraryaddict
261b18fcf0
Add GameType options
2015-03-17 23:59:59 +13:00
libraryaddict
52f0941fb9
Add resourcepack options
2015-03-17 23:59:24 +13:00
libraryaddict
733134f709
Update SurvivalGames
2015-03-17 23:53:43 +13:00
libraryaddict
f12d0bf9ef
Allow disabling of game start sounds, and changing of the game PrepareTime.
2015-03-17 23:52:58 +13:00
libraryaddict
340441edbe
SG kit fletcher no longer can pickup fletched arrows
2015-03-17 18:30:48 +13:00
libraryaddict
06ebbbbc73
Remove SG wolf pet on quit
2015-03-17 18:30:17 +13:00
libraryaddict
ec30269a14
Add new loot classes to manage loot
2015-03-17 18:08:47 +13:00
libraryaddict
41469b198a
Change wizards spells to use conditions for potion effects
2015-03-17 18:07:43 +13:00
libraryaddict
03d77abed3
Don't allow people holding gold ingots to deal a lot of damage
2015-03-17 17:49:10 +13:00
libraryaddict
921deb5270
Update disguises for 1.8, add sleeping ability to player disguises
2015-03-17 17:48:29 +13:00
libraryaddict
65a9073c69
Add border packet and resource pack status packet. Add ability to listen to incoming packet Use Entity
2015-03-17 17:42:16 +13:00
Cheese
3eba559b01
fixed merge error
2015-03-17 15:02:41 +11:00
Cheese
73c66fa93f
Merge branch 'SpecRemoveCreative'
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-17 14:57:17 +11:00
Cheese
e3eb62887d
fixed an eventgame bug
2015-03-17 14:50:56 +11:00
Cheese
44e887ec61
fixed give command to properly assign item data
2015-03-17 12:06:41 +11:00
Cheese
28c683a37a
fixed display for effects
2015-03-16 15:16:17 +11:00
Cheese
b3320d7cbe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-16 15:01:48 +11:00
Cheese
c941c383e7
fixed hosts not being able to use creative inventroy
2015-03-16 15:01:35 +11:00
Jonathan Williams
2dade32499
Added support for creating Event servers.
2015-03-15 20:50:54 -07:00
Jonathan Williams
8a027872aa
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-15 20:50:14 -07:00
Cheese
efa2b649bd
updated eventserver not expiring
2015-03-16 14:19:43 +11:00
Cheese
a700b61613
added WE permissions to event servers.
2015-03-16 14:10:58 +11:00
Cheese
4581f49948
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-16 13:39:54 +11:00
Cheese
420c4e7229
More work on Event game
2015-03-16 13:39:33 +11:00
Jonathan Williams
d1bc6e4567
Updated EnjinTranslator.
2015-03-15 19:30:37 -07:00
Jonathan Williams
eca5651d83
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-15 19:29:06 -07:00
Jonathan Williams
4d557cb392
Code to improve stat recording, commented out for now.
2015-03-15 19:28:58 -07:00
Jonathan Williams
de780ae2f0
Some geolocation call test code.
2015-03-15 19:28:38 -07:00
Ty Sayers
cec6cf9b2d
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-03-15 13:00:23 -04:00
Ty Sayers
8279f0b17a
Add missing PlayerStatus object to ServerData for cross-server player tracking.
2015-03-15 13:00:15 -04:00
Jonathan Williams
4b878c5f27
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-15 04:48:01 -07:00
Jonathan Williams
fcbac70deb
Tweaked DB Pool settings, increased connections to 4.
...
Disabled Friend and Leaderboard for now.
2015-03-15 04:47:53 -07:00
libraryaddict
bead4a7626
No longer need to constantly set the durability of items in the sheep game
2015-03-15 13:13:06 +13:00
libraryaddict
db7def2980
Add relative teleports to /teleport command
2015-03-15 12:42:29 +13:00
libraryaddict
f4b6a53adb
Add Wither to ConditionFactory
2015-03-15 12:36:18 +13:00
libraryaddict
ba04c5e834
Fixed GameScoreboard demanding strings are shortened to 15 chars when the max is 16
2015-03-15 12:35:39 +13:00
libraryaddict
e9fe1fb423
Formatted SpellType, fixed lightning spell description
2015-03-15 12:34:45 +13:00
libraryaddict
18094fea9b
Change UtilPlayer.sendPacket(Packet) to UtilPlayer.sendPacket(Packet...)
2015-03-15 12:32:59 +13:00
libraryaddict
503106892d
Fixed UtilTime for displaying decimals when trimmed
2015-03-15 12:32:42 +13:00
libraryaddict
20a51ee7fc
Change Blood to unstackable items
2015-03-15 12:30:42 +13:00
libraryaddict
e1c284722e
Add method getEntityById to UtilEnt
2015-03-15 12:28:17 +13:00
Ty Sayers
7811279b26
Convert friend system over to redis-based PlayerStatus data tracking from old SQL storage.
2015-03-14 17:41:16 -04:00
Jonathan Williams
c1c284002d
Fixed JREs for Mineplexer and BungeeRotator.
...
Added a little more info on debug for BungeeRotator.
2015-03-14 06:21:04 -07:00
Jonathan Williams
d38a28981b
Fixed NPE when type /friend with a space after it.
2015-03-14 06:20:33 -07:00
Jonathan Williams
a002769ac0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-13 22:53:46 -07:00
Ty Sayers
ffedc82785
Commit leftover package that was not committed from previous re-organization.
2015-03-14 01:52:37 -04:00
Jonathan Williams
b6a8b4cee3
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-13 22:45:48 -07:00
