diff --git a/ConfigGUI/MainForm.Adapter.cs b/ConfigGUI/MainForm.Adapter.cs
index 9f9acb1..96927fb 100644
--- a/ConfigGUI/MainForm.Adapter.cs
+++ b/ConfigGUI/MainForm.Adapter.cs
@@ -282,8 +282,6 @@ void ApplyTabSecurity() {
cPatrolledRank.SelectedIndex = RankManager.GetIndex( RankManager.PatrolledRank );
}
- xPaidPlayersOnly.Checked = ConfigKey.PaidPlayersOnly.Enabled();
-
xBlockDBEnabled.Checked = ConfigKey.BlockDBEnabled.Enabled();
xBlockDBAutoEnable.Checked = ConfigKey.BlockDBAutoEnable.Enabled();
@@ -535,7 +533,6 @@ void SaveConfig() {
} else {
ConfigKey.PatrolledRank.TrySetValue( RankManager.PatrolledRank.FullName );
}
- ConfigKey.PaidPlayersOnly.TrySetValue( xPaidPlayersOnly.Checked );
ConfigKey.BlockDBEnabled.TrySetValue( xBlockDBEnabled.Checked );
ConfigKey.BlockDBAutoEnable.TrySetValue( xBlockDBAutoEnable.Checked );
diff --git a/ConfigGUI/MainForm.Designer.cs b/ConfigGUI/MainForm.Designer.cs
index 26ec863..d5e350d 100644
--- a/ConfigGUI/MainForm.Designer.cs
+++ b/ConfigGUI/MainForm.Designer.cs
@@ -119,7 +119,6 @@ private void InitializeComponent() {
this.bLowerRank = new System.Windows.Forms.Button();
this.bRaiseRank = new System.Windows.Forms.Button();
this.gRankOptions = new System.Windows.Forms.GroupBox();
- this.HiddenBox = new System.Windows.Forms.CheckBox();
this.lFillLimitUnits = new System.Windows.Forms.Label();
this.nFillLimit = new System.Windows.Forms.NumericUpDown();
this.lFillLimit = new System.Windows.Forms.Label();
@@ -140,6 +139,7 @@ private void InitializeComponent() {
this.xKickIdle = new System.Windows.Forms.CheckBox();
this.nAntiGriefBlocks = new System.Windows.Forms.NumericUpDown();
this.xReserveSlot = new System.Windows.Forms.CheckBox();
+ this.HiddenBox = new System.Windows.Forms.CheckBox();
this.tPrefix = new System.Windows.Forms.TextBox();
this.lPrefix = new System.Windows.Forms.Label();
this.lRankColor = new System.Windows.Forms.Label();
@@ -159,7 +159,6 @@ private void InitializeComponent() {
this.gSecurityMisc = new System.Windows.Forms.GroupBox();
this.xAnnounceRankChangeReasons = new System.Windows.Forms.CheckBox();
this.xRequireKickReason = new System.Windows.Forms.CheckBox();
- this.xPaidPlayersOnly = new System.Windows.Forms.CheckBox();
this.lPatrolledRankAndBelow = new System.Windows.Forms.Label();
this.cPatrolledRank = new System.Windows.Forms.ComboBox();
this.lPatrolledRank = new System.Windows.Forms.Label();
@@ -1490,17 +1489,6 @@ private void InitializeComponent() {
this.gRankOptions.TabStop = false;
this.gRankOptions.Text = "Rank Options";
//
- // HiddenBox
- //
- this.HiddenBox.AutoSize = true;
- this.HiddenBox.Location = new System.Drawing.Point(13, 270);
- this.HiddenBox.Name = "HiddenBox";
- this.HiddenBox.Size = new System.Drawing.Size(79, 19);
- this.HiddenBox.TabIndex = 25;
- this.HiddenBox.Text = "Hide rank";
- this.HiddenBox.UseVisualStyleBackColor = true;
- this.HiddenBox.CheckedChanged += new System.EventHandler(this.HiddenBox_CheckedChanged);
- //
// lFillLimitUnits
//
this.lFillLimitUnits.AutoSize = true;
@@ -1726,6 +1714,17 @@ private void InitializeComponent() {
this.xReserveSlot.UseVisualStyleBackColor = true;
this.xReserveSlot.CheckedChanged += new System.EventHandler(this.xReserveSlot_CheckedChanged);
//
+ // HiddenBox
+ //
+ this.HiddenBox.AutoSize = true;
+ this.HiddenBox.Location = new System.Drawing.Point(13, 270);
+ this.HiddenBox.Name = "HiddenBox";
+ this.HiddenBox.Size = new System.Drawing.Size(79, 19);
+ this.HiddenBox.TabIndex = 25;
+ this.HiddenBox.Text = "Hide rank";
+ this.HiddenBox.UseVisualStyleBackColor = true;
+ this.HiddenBox.CheckedChanged += new System.EventHandler(this.HiddenBox_CheckedChanged);
+ //
// tPrefix
//
this.tPrefix.Enabled = false;
@@ -1906,7 +1905,6 @@ private void InitializeComponent() {
//
this.gSecurityMisc.Controls.Add(this.xAnnounceRankChangeReasons);
this.gSecurityMisc.Controls.Add(this.xRequireKickReason);
- this.gSecurityMisc.Controls.Add(this.xPaidPlayersOnly);
this.gSecurityMisc.Controls.Add(this.lPatrolledRankAndBelow);
this.gSecurityMisc.Controls.Add(this.cPatrolledRank);
this.gSecurityMisc.Controls.Add(this.lPatrolledRank);
@@ -1924,7 +1922,7 @@ private void InitializeComponent() {
// xAnnounceRankChangeReasons
//
this.xAnnounceRankChangeReasons.AutoSize = true;
- this.xAnnounceRankChangeReasons.Location = new System.Drawing.Point(336, 109);
+ this.xAnnounceRankChangeReasons.Location = new System.Drawing.Point(336, 96);
this.xAnnounceRankChangeReasons.Name = "xAnnounceRankChangeReasons";
this.xAnnounceRankChangeReasons.Size = new System.Drawing.Size(253, 19);
this.xAnnounceRankChangeReasons.TabIndex = 6;
@@ -1934,28 +1932,17 @@ private void InitializeComponent() {
// xRequireKickReason
//
this.xRequireKickReason.AutoSize = true;
- this.xRequireKickReason.Location = new System.Drawing.Point(42, 59);
+ this.xRequireKickReason.Location = new System.Drawing.Point(42, 46);
this.xRequireKickReason.Name = "xRequireKickReason";
this.xRequireKickReason.Size = new System.Drawing.Size(135, 19);
this.xRequireKickReason.TabIndex = 1;
this.xRequireKickReason.Text = "Require kick reason";
this.xRequireKickReason.UseVisualStyleBackColor = true;
//
- // xPaidPlayersOnly
- //
- this.xPaidPlayersOnly.AutoSize = true;
- this.xPaidPlayersOnly.Location = new System.Drawing.Point(42, 20);
- this.xPaidPlayersOnly.Name = "xPaidPlayersOnly";
- this.xPaidPlayersOnly.Size = new System.Drawing.Size(489, 19);
- this.xPaidPlayersOnly.TabIndex = 0;
- this.xPaidPlayersOnly.Text = "Only allow players with paid Minecraft accounts to join the server (not recommend" +
- "ed).";
- this.xPaidPlayersOnly.UseVisualStyleBackColor = true;
- //
// lPatrolledRankAndBelow
//
this.lPatrolledRankAndBelow.AutoSize = true;
- this.lPatrolledRankAndBelow.Location = new System.Drawing.Point(282, 145);
+ this.lPatrolledRankAndBelow.Location = new System.Drawing.Point(282, 132);
this.lPatrolledRankAndBelow.Name = "lPatrolledRankAndBelow";
this.lPatrolledRankAndBelow.Size = new System.Drawing.Size(72, 15);
this.lPatrolledRankAndBelow.TabIndex = 9;
@@ -1965,7 +1952,7 @@ private void InitializeComponent() {
//
this.cPatrolledRank.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cPatrolledRank.FormattingEnabled = true;
- this.cPatrolledRank.Location = new System.Drawing.Point(153, 142);
+ this.cPatrolledRank.Location = new System.Drawing.Point(153, 129);
this.cPatrolledRank.Name = "cPatrolledRank";
this.cPatrolledRank.Size = new System.Drawing.Size(123, 23);
this.cPatrolledRank.TabIndex = 8;
@@ -1974,7 +1961,7 @@ private void InitializeComponent() {
// lPatrolledRank
//
this.lPatrolledRank.AutoSize = true;
- this.lPatrolledRank.Location = new System.Drawing.Point(64, 145);
+ this.lPatrolledRank.Location = new System.Drawing.Point(64, 132);
this.lPatrolledRank.Name = "lPatrolledRank";
this.lPatrolledRank.Size = new System.Drawing.Size(83, 15);
this.lPatrolledRank.TabIndex = 7;
@@ -1983,7 +1970,7 @@ private void InitializeComponent() {
// xAnnounceRankChanges
//
this.xAnnounceRankChanges.AutoSize = true;
- this.xAnnounceRankChanges.Location = new System.Drawing.Point(304, 84);
+ this.xAnnounceRankChanges.Location = new System.Drawing.Point(304, 71);
this.xAnnounceRankChanges.Name = "xAnnounceRankChanges";
this.xAnnounceRankChanges.Size = new System.Drawing.Size(231, 19);
this.xAnnounceRankChanges.TabIndex = 5;
@@ -1994,7 +1981,7 @@ private void InitializeComponent() {
// xAnnounceKickAndBanReasons
//
this.xAnnounceKickAndBanReasons.AutoSize = true;
- this.xAnnounceKickAndBanReasons.Location = new System.Drawing.Point(304, 59);
+ this.xAnnounceKickAndBanReasons.Location = new System.Drawing.Point(304, 46);
this.xAnnounceKickAndBanReasons.Name = "xAnnounceKickAndBanReasons";
this.xAnnounceKickAndBanReasons.Size = new System.Drawing.Size(244, 19);
this.xAnnounceKickAndBanReasons.TabIndex = 4;
@@ -2004,7 +1991,7 @@ private void InitializeComponent() {
// xRequireRankChangeReason
//
this.xRequireRankChangeReason.AutoSize = true;
- this.xRequireRankChangeReason.Location = new System.Drawing.Point(42, 109);
+ this.xRequireRankChangeReason.Location = new System.Drawing.Point(42, 96);
this.xRequireRankChangeReason.Name = "xRequireRankChangeReason";
this.xRequireRankChangeReason.Size = new System.Drawing.Size(236, 19);
this.xRequireRankChangeReason.TabIndex = 3;
@@ -2014,7 +2001,7 @@ private void InitializeComponent() {
// xRequireBanReason
//
this.xRequireBanReason.AutoSize = true;
- this.xRequireBanReason.Location = new System.Drawing.Point(42, 84);
+ this.xRequireBanReason.Location = new System.Drawing.Point(42, 71);
this.xRequireBanReason.Name = "xRequireBanReason";
this.xRequireBanReason.Size = new System.Drawing.Size(184, 19);
this.xRequireBanReason.TabIndex = 2;
@@ -3957,7 +3944,6 @@ private void InitializeComponent() {
private System.Windows.Forms.Label lLogConsoleOptionsDescription;
private System.Windows.Forms.CheckBox xIRCBotAnnounceServerEvents;
private System.Windows.Forms.CheckBox xIRCUseColor;
- private System.Windows.Forms.CheckBox xPaidPlayersOnly;
private System.Windows.Forms.Button bMapPath;
private System.Windows.Forms.CheckBox xMapPath;
private System.Windows.Forms.TextBox tMapPath;
diff --git a/ConfigGUI/MainForm.ToolTips.cs b/ConfigGUI/MainForm.ToolTips.cs
index 35fc1d6..199349a 100644
--- a/ConfigGUI/MainForm.ToolTips.cs
+++ b/ConfigGUI/MainForm.ToolTips.cs
@@ -691,8 +691,6 @@ void FillToolTipsSecurity() {
toolTip.SetToolTip( nAntispamMaxWarnings, ConfigKey.AntispamMaxWarnings.GetDescription() );
toolTip.SetToolTip( lAntispamMaxWarnings, ConfigKey.AntispamMaxWarnings.GetDescription() );
- toolTip.SetToolTip( xPaidPlayersOnly, ConfigKey.PaidPlayersOnly.GetDescription() );
-
toolTip.SetToolTip( xBlockDBEnabled, ConfigKey.BlockDBEnabled.GetDescription() );
toolTip.SetToolTip( xBlockDBAutoEnable, ConfigKey.BlockDBAutoEnable.GetDescription() );
toolTip.SetToolTip( cBlockDBAutoEnableRank, ConfigKey.BlockDBAutoEnableRank.GetDescription() );
diff --git a/fCraft/Network/Player.Networking.cs b/fCraft/Network/Player.Networking.cs
index 69f6154..a692c24 100644
--- a/fCraft/Network/Player.Networking.cs
+++ b/fCraft/Network/Player.Networking.cs
@@ -694,13 +694,6 @@ bool LoginSequence() {
ConfigKey.ServerName.GetString(),
"Please wait; Checking paid status..." ) );
writer.Flush();
-
- if( !CheckPaidStatus( Name ) ) {
- Logger.Log( LogType.SystemActivity,
- "Player {0} was kicked because their account is not paid, and PaidPlayersOnly setting is enabled.", Name );
- KickNow( "Paid players allowed only.", LeaveReason.LoginFailed );
- return false;
- }
}
diff --git a/fCraft/Player/Player.cs b/fCraft/Player/Player.cs
index 7abf879..c98adae 100644
--- a/fCraft/Player/Player.cs
+++ b/fCraft/Player/Player.cs
@@ -1600,37 +1600,6 @@ public bool StopPossessing ( [NotNull]Player target ) {
#region Static Utilities
- static readonly Uri PaidCheckUri = new Uri( "http://minecraft.net/haspaid.jsp?user=" );
- const int PaidCheckTimeout = 5000;
-
-
- /// Checks whether a given player has a paid minecraft.net account.
- /// True if the account is paid. False if it is not paid, or if information is unavailable.
- public static bool CheckPaidStatus ( [NotNull] string name ) {
- if ( name == null ) throw new ArgumentNullException( "name" );
- HttpWebRequest request = ( HttpWebRequest )WebRequest.Create( PaidCheckUri + Uri.EscapeDataString( name ) );
- request.ServicePoint.BindIPEndPointDelegate = new BindIPEndPoint( Server.BindIPEndPointCallback );
- request.Timeout = PaidCheckTimeout;
- request.CachePolicy = new RequestCachePolicy( RequestCacheLevel.NoCacheNoStore );
-
- try {
- using ( WebResponse response = request.GetResponse() ) {
- // ReSharper disable AssignNullToNotNullAttribute
- using ( StreamReader responseReader = new StreamReader( response.GetResponseStream() ) ) {
- // ReSharper restore AssignNullToNotNullAttribute
- string paidStatusString = responseReader.ReadToEnd();
- bool isPaid;
- return Boolean.TryParse( paidStatusString, out isPaid ) && isPaid;
- }
- }
- } catch ( WebException ex ) {
- Logger.Log( LogType.Warning,
- "Could not check paid status of player {0}: {1}",
- name, ex.Message );
- return false;
- }
- }
-
/// Ensures that a player name has the correct length and character set.
public static bool IsValidName ( [NotNull] string name ) {