From bb8b1d60f96401855ebb0c5ee4c438f8117bae8f Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Tue, 23 Dec 2014 05:56:17 -0500 Subject: [PATCH 1/6] 30 seconds recharge on ability to host locally. --- .../src/mineplex/core/personalServer/HostServerCommand.java | 4 ++++ .../mineplex/core/personalServer/PersonalServerManager.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/HostServerCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/HostServerCommand.java index b447376bf..4a6a7185b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/HostServerCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/HostServerCommand.java @@ -4,6 +4,7 @@ import org.bukkit.entity.Player; import mineplex.core.command.CommandBase; import mineplex.core.common.Rank; +import mineplex.core.recharge.Recharge; public class HostServerCommand extends CommandBase { @@ -15,6 +16,9 @@ public class HostServerCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { + if (!Recharge.Instance.use(caller, "Host Server", 30000, true, true)) + return; + Plugin.hostServer(caller, caller.getName()); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java index 6cbc738e3..5f63b8cf6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java @@ -14,6 +14,7 @@ import mineplex.core.account.CoreClientManager; import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.itemstack.ItemStackFactory; +import mineplex.core.recharge.Recharge; import mineplex.serverdata.Region; import mineplex.serverdata.ServerGroup; import mineplex.serverdata.ServerManager; @@ -57,6 +58,9 @@ public class PersonalServerManager extends MiniPlugin { if (_interfaceItem.equals(event.getPlayer().getItemInHand())) { + if (!Recharge.Instance.use(event.getPlayer(), "Host Server", 30000, true, true)) + return; + hostServer(event.getPlayer(), event.getPlayer().getName()); } } @@ -84,7 +88,7 @@ public class PersonalServerManager extends MiniPlugin public void hostServer(Player player, String serverName) { - createGroup(player, serverName, 24, 24, "Smash"); + createGroup(player, serverName, 12, 24, "Smash"); } private void createGroup(final Player host, final String serverName, int minPlayers, int maxPlayers, String games) From d2e078f890a61678d83add9c9c37f1fb62411ef3 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Tue, 23 Dec 2014 06:04:42 -0500 Subject: [PATCH 2/6] Fixed ranks for MPS --- .../mineplex/core/personalServer/HostServerCommand.java | 2 +- .../core/personalServer/PersonalServerManager.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/HostServerCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/HostServerCommand.java index 4ca21eb54..b4be739be 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/HostServerCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/HostServerCommand.java @@ -10,7 +10,7 @@ public class HostServerCommand extends CommandBase { public HostServerCommand(PersonalServerManager plugin) { - super(plugin, Rank.ULTRA, "hostserver"); + super(plugin, Rank.LEGEND, "hostserver"); } @Override diff --git a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java index e9a898b07..1f15bf26c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java @@ -70,13 +70,13 @@ public class PersonalServerManager extends MiniPlugin if (!Recharge.Instance.use(event.getPlayer(), "Host Server", 30000, true, true)) return; - if (_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.ULTRA)) + if (_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.LEGEND)) { showHostMessage(event.getPlayer()); } else { - UtilPlayer.message(event.getPlayer(), F.main("Server", "Only players with " + F.rank(Rank.ULTRA) + C.mBody + "+ can host private servers")); + UtilPlayer.message(event.getPlayer(), F.main("Server", "Only players with " + F.rank(Rank.LEGEND) + C.mBody + "+ can host private servers")); } } } @@ -85,11 +85,13 @@ public class PersonalServerManager extends MiniPlugin { UtilPlayer.message(player, C.cRed + "------------------------------------------------"); UtilPlayer.message(player, "This will create a Mineplex Player Server for you."); - UtilPlayer.message(player, "Here you can play your favourite games with friends!"); + UtilPlayer.message(player, "Here you can play your favorite games with friends!"); + new JsonMessage("Please ").click(ClickEvent.RUN_COMMAND, "/hostserver") .hover(HoverEvent.SHOW_TEXT, C.cGray + "Click to Create Server") .extra("CLICK HERE").color(Color.GREEN).extra(" to confirm you want to do this.") .color(Color.WHITE).send(JsonMessage.MessageType.CHAT_BOX, player); + UtilPlayer.message(player, C.cRed + "------------------------------------------------"); } From 50993d19f3d69a535fb6a675b928ccf980a80bf5 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Tue, 23 Dec 2014 06:07:14 -0500 Subject: [PATCH 3/6] Added Legend for Enjin --- .../src/mineplex/enjinTranslator/Enjin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java b/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java index 26f865d51..f070c6bf6 100644 --- a/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java +++ b/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/Enjin.java @@ -322,7 +322,7 @@ public class Enjin extends MiniPlugin implements CommandExecutor { public void run() { - if (_clientManager.Get(name).GetRank() == Rank.ALL || _clientManager.Get(name).GetRank() == Rank.ULTRA || _clientManager.Get(name).GetRank() == Rank.HERO) + if (_clientManager.Get(name).GetRank() == Rank.ALL || _clientManager.Get(name).GetRank() == Rank.ULTRA || _clientManager.Get(name).GetRank() == Rank.HERO || _clientManager.Get(name).GetRank() == Rank.LEGEND) { _clientManager.SaveRank(name, mineplex.core.common.Rank.valueOf(rank), perm); System.out.println("[" + _dateFormat.format(new Date()) + "] " + name + " received " + rank + " " + (perm ? "permanently." : "for 1 month.")); From e96acba76e4953741c361e68eb9e388a8cbe0e6c Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Tue, 23 Dec 2014 06:09:50 -0500 Subject: [PATCH 4/6] Removed old/unused code. --- .../ServerHandler/ServerHandler.1.2.dotCover | 11 -- .../ServerHandler.5.1.ReSharper.user | 169 ----------------- Webserver/ServerHandler/ServerHandler.sln | 20 -- .../ServerHandler.sln.DotSettings.user | 2 - Webserver/ServerHandler/ServerHandler.suo | Bin 30720 -> 0 bytes .../ServerHandler/Form1.Designer.cs | 175 ------------------ .../ServerHandler/ServerHandler/Form1.cs | 72 ------- .../ServerHandler/ServerHandler/Form1.resx | 120 ------------ .../ServerHandler/ServerHandler/Program.cs | 21 --- .../ServerHandler/Properties/AssemblyInfo.cs | 36 ---- .../Properties/Resources.Designer.cs | 71 ------- .../ServerHandler/Properties/Resources.resx | 117 ------------ .../Properties/Settings.Designer.cs | 30 --- .../Properties/Settings.settings | 7 - .../ServerHandler/ServerHandler/Server.cs | 117 ------------ .../ServerHandler/ServerHandler.csproj | 92 --------- .../ServerHandler/ServerHandler/app.manifest | 49 ----- Website/LOCWebsite.suo | Bin 474624 -> 474624 bytes 18 files changed, 1109 deletions(-) delete mode 100644 Webserver/ServerHandler/ServerHandler.1.2.dotCover delete mode 100644 Webserver/ServerHandler/ServerHandler.5.1.ReSharper.user delete mode 100644 Webserver/ServerHandler/ServerHandler.sln delete mode 100644 Webserver/ServerHandler/ServerHandler.sln.DotSettings.user delete mode 100644 Webserver/ServerHandler/ServerHandler.suo delete mode 100644 Webserver/ServerHandler/ServerHandler/Form1.Designer.cs delete mode 100644 Webserver/ServerHandler/ServerHandler/Form1.cs delete mode 100644 Webserver/ServerHandler/ServerHandler/Form1.resx delete mode 100644 Webserver/ServerHandler/ServerHandler/Program.cs delete mode 100644 Webserver/ServerHandler/ServerHandler/Properties/AssemblyInfo.cs delete mode 100644 Webserver/ServerHandler/ServerHandler/Properties/Resources.Designer.cs delete mode 100644 Webserver/ServerHandler/ServerHandler/Properties/Resources.resx delete mode 100644 Webserver/ServerHandler/ServerHandler/Properties/Settings.Designer.cs delete mode 100644 Webserver/ServerHandler/ServerHandler/Properties/Settings.settings delete mode 100644 Webserver/ServerHandler/ServerHandler/Server.cs delete mode 100644 Webserver/ServerHandler/ServerHandler/ServerHandler.csproj delete mode 100644 Webserver/ServerHandler/ServerHandler/app.manifest diff --git a/Webserver/ServerHandler/ServerHandler.1.2.dotCover b/Webserver/ServerHandler/ServerHandler.1.2.dotCover deleted file mode 100644 index 6f8c06edc..000000000 --- a/Webserver/ServerHandler/ServerHandler.1.2.dotCover +++ /dev/null @@ -1,11 +0,0 @@ - - - C:\Work\LOC\Webserver\ServerHandler - - - - - - - - \ No newline at end of file diff --git a/Webserver/ServerHandler/ServerHandler.5.1.ReSharper.user b/Webserver/ServerHandler/ServerHandler.5.1.ReSharper.user deleted file mode 100644 index 1ea032aa0..000000000 --- a/Webserver/ServerHandler/ServerHandler.5.1.ReSharper.user +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - False - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Never - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Webserver/ServerHandler/ServerHandler.sln b/Webserver/ServerHandler/ServerHandler.sln deleted file mode 100644 index e17e98ca0..000000000 --- a/Webserver/ServerHandler/ServerHandler.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerHandler", "ServerHandler\ServerHandler.csproj", "{7674049F-5C67-4CD0-AD1F-8F23C718E37B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7674049F-5C67-4CD0-AD1F-8F23C718E37B}.Debug|x86.ActiveCfg = Debug|x86 - {7674049F-5C67-4CD0-AD1F-8F23C718E37B}.Debug|x86.Build.0 = Debug|x86 - {7674049F-5C67-4CD0-AD1F-8F23C718E37B}.Release|x86.ActiveCfg = Release|x86 - {7674049F-5C67-4CD0-AD1F-8F23C718E37B}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Webserver/ServerHandler/ServerHandler.sln.DotSettings.user b/Webserver/ServerHandler/ServerHandler.sln.DotSettings.user deleted file mode 100644 index 24050a119..000000000 --- a/Webserver/ServerHandler/ServerHandler.sln.DotSettings.user +++ /dev/null @@ -1,2 +0,0 @@ - - True \ No newline at end of file diff --git a/Webserver/ServerHandler/ServerHandler.suo b/Webserver/ServerHandler/ServerHandler.suo deleted file mode 100644 index f64c6cf9056c74a5c4047d94b562ffd895626154..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 30720 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 diff --git a/Webserver/ServerHandler/ServerHandler/Form1.Designer.cs b/Webserver/ServerHandler/ServerHandler/Form1.Designer.cs deleted file mode 100644 index cd7d9756a..000000000 --- a/Webserver/ServerHandler/ServerHandler/Form1.Designer.cs +++ /dev/null @@ -1,175 +0,0 @@ -namespace ServerHandler -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.button1 = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.button4 = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.button5 = new System.Windows.Forms.Button(); - this.SuspendLayout(); - // - // button1 - // - this.button1.Location = new System.Drawing.Point(100, 12); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(135, 26); - this.button1.TabIndex = 0; - this.button1.Text = "Start"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // button2 - // - this.button2.Location = new System.Drawing.Point(100, 55); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(135, 26); - this.button2.TabIndex = 1; - this.button2.Text = "Start"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); - // - // button3 - // - this.button3.Location = new System.Drawing.Point(100, 97); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(135, 26); - this.button3.TabIndex = 2; - this.button3.Text = "Start"; - this.button3.UseVisualStyleBackColor = true; - this.button3.Click += new System.EventHandler(this.button3_Click); - // - // button4 - // - this.button4.Location = new System.Drawing.Point(100, 138); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(135, 26); - this.button4.TabIndex = 3; - this.button4.Text = "Start"; - this.button4.UseVisualStyleBackColor = true; - this.button4.Click += new System.EventHandler(this.button4_Click); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(37, 19); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(29, 13); - this.label1.TabIndex = 4; - this.label1.Text = "HG1"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(37, 62); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(29, 13); - this.label2.TabIndex = 5; - this.label2.Text = "HG2"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(37, 104); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(29, 13); - this.label3.TabIndex = 6; - this.label3.Text = "HG3"; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(37, 145); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(29, 13); - this.label4.TabIndex = 7; - this.label4.Text = "HG4"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(37, 184); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(29, 13); - this.label5.TabIndex = 9; - this.label5.Text = "HG5"; - // - // button5 - // - this.button5.Location = new System.Drawing.Point(100, 177); - this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(135, 26); - this.button5.TabIndex = 8; - this.button5.Text = "Start"; - this.button5.UseVisualStyleBackColor = true; - this.button5.Click += new System.EventHandler(this.button5_Click); - // - // Form1 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(244, 216); - this.Controls.Add(this.label5); - this.Controls.Add(this.button5); - this.Controls.Add(this.label4); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.button4); - this.Controls.Add(this.button3); - this.Controls.Add(this.button2); - this.Controls.Add(this.button1); - this.Name = "Form1"; - this.Text = "Form1"; - this.Closing += OnFormClosing; - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button4; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Button button5; - } -} - diff --git a/Webserver/ServerHandler/ServerHandler/Form1.cs b/Webserver/ServerHandler/ServerHandler/Form1.cs deleted file mode 100644 index 31a143d17..000000000 --- a/Webserver/ServerHandler/ServerHandler/Form1.cs +++ /dev/null @@ -1,72 +0,0 @@ -namespace ServerHandler -{ - using System; - using System.Windows.Forms; - - public partial class Form1 : Form - { - private readonly Server _hg1; - private readonly Server _hg2; - private readonly Server _hg3; - private readonly Server _hg4; - private readonly Server _hg5; - - public Form1() - { - InitializeComponent(); - - _hg1 = new Server("hg1"); - _hg2 = new Server("hg2"); - _hg3 = new Server("hg3"); - _hg4 = new Server("hg4"); - _hg5 = new Server("hg5"); - } - - private void OnFormClosing(object sender, EventArgs e) - { - _hg1.Stop(); - _hg2.Stop(); - _hg3.Stop(); - _hg4.Stop(); - } - - private void button1_Click(object sender, EventArgs e) - { - ToggleServerAndButton(_hg1, (Button)sender); - } - - private void button2_Click(object sender, EventArgs e) - { - ToggleServerAndButton(_hg2, (Button)sender); - } - - private void button3_Click(object sender, EventArgs e) - { - ToggleServerAndButton(_hg3, (Button)sender); - } - - private void button4_Click(object sender, EventArgs e) - { - ToggleServerAndButton(_hg4, (Button)sender); - } - - private void button5_Click(object sender, EventArgs e) - { - ToggleServerAndButton(_hg5, (Button) sender); - } - - private void ToggleServerAndButton(Server server, Button button) - { - server.ToggleRunning(); - - if (server.ShouldBeRunning()) - { - button.Text = "Stop"; - } - else - { - button.Text = "Start"; - } - } - } -} diff --git a/Webserver/ServerHandler/ServerHandler/Form1.resx b/Webserver/ServerHandler/ServerHandler/Form1.resx deleted file mode 100644 index 1af7de150..000000000 --- a/Webserver/ServerHandler/ServerHandler/Form1.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Webserver/ServerHandler/ServerHandler/Program.cs b/Webserver/ServerHandler/ServerHandler/Program.cs deleted file mode 100644 index 04bcfffe3..000000000 --- a/Webserver/ServerHandler/ServerHandler/Program.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; - -namespace ServerHandler -{ - static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); - } - } -} diff --git a/Webserver/ServerHandler/ServerHandler/Properties/AssemblyInfo.cs b/Webserver/ServerHandler/ServerHandler/Properties/AssemblyInfo.cs deleted file mode 100644 index c5af84309..000000000 --- a/Webserver/ServerHandler/ServerHandler/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ServerHandler")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Windows User")] -[assembly: AssemblyProduct("ServerHandler")] -[assembly: AssemblyCopyright("Copyright © Windows User 2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6c5498e0-d3d9-4c0a-8a68-0c1de5bda313")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Webserver/ServerHandler/ServerHandler/Properties/Resources.Designer.cs b/Webserver/ServerHandler/ServerHandler/Properties/Resources.Designer.cs deleted file mode 100644 index 271284c8a..000000000 --- a/Webserver/ServerHandler/ServerHandler/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.269 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace ServerHandler.Properties -{ - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ServerHandler.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/Webserver/ServerHandler/ServerHandler/Properties/Resources.resx b/Webserver/ServerHandler/ServerHandler/Properties/Resources.resx deleted file mode 100644 index af7dbebba..000000000 --- a/Webserver/ServerHandler/ServerHandler/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Webserver/ServerHandler/ServerHandler/Properties/Settings.Designer.cs b/Webserver/ServerHandler/ServerHandler/Properties/Settings.Designer.cs deleted file mode 100644 index 693ed01ca..000000000 --- a/Webserver/ServerHandler/ServerHandler/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.269 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace ServerHandler.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/Webserver/ServerHandler/ServerHandler/Properties/Settings.settings b/Webserver/ServerHandler/ServerHandler/Properties/Settings.settings deleted file mode 100644 index 39645652a..000000000 --- a/Webserver/ServerHandler/ServerHandler/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Webserver/ServerHandler/ServerHandler/Server.cs b/Webserver/ServerHandler/ServerHandler/Server.cs deleted file mode 100644 index 710fed810..000000000 --- a/Webserver/ServerHandler/ServerHandler/Server.cs +++ /dev/null @@ -1,117 +0,0 @@ -namespace ServerHandler -{ - using System; - using System.Diagnostics; - using System.IO; - using System.Reflection; - using System.Threading; - using System.Windows.Forms; - - public class Server - { - private bool _shouldBeRunning; - private Thread _watcherThread; - private Process _serverProcess; - private String _path; - - public Server(String path) - { - _path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\" + path; - - _watcherThread = new Thread(Watch); - _watcherThread.Start(); - } - - public bool ShouldBeRunning() - { - return _shouldBeRunning; - } - - public void ToggleRunning() - { - _shouldBeRunning = !_shouldBeRunning; - - if (_serverProcess == null) - { - try - { - String memParams = "-Djava.ext.dirs=lib -Xincgc -Xmx2048M "; - String args = memParams + "-jar " + "\"" + _path + @"\craftbukkit-0.0.1-snapshot.jar"; - var processInfo = new ProcessStartInfo("java.exe", args); - processInfo.WorkingDirectory = _path; - processInfo.Verb = "runas"; - processInfo.UseShellExecute = false; - - _serverProcess = new Process(); - _serverProcess.StartInfo = processInfo; - } - catch (Exception ex) - { - MessageBox.Show("Error creating process " + ex.Message + "\n" + ex.StackTrace); - } - } - - if (!_shouldBeRunning) - { - if (!_serverProcess.HasExited) - { - _serverProcess.Kill(); - } - } - } - - public void PrepFiles() - { - var worldDirectory = new DirectoryInfo(_path + @"\world"); - var worldEndDirectory = new DirectoryInfo(_path + @"\world_the_end"); - - try - { - if (worldDirectory.Exists) - worldDirectory.Delete(true); - - if (worldEndDirectory.Exists) - worldEndDirectory.Delete(true); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message + "\n" + ex.StackTrace); - } - - var commonDirectory = new DirectoryInfo(Directory.GetParent(Assembly.GetExecutingAssembly().Location) + @"\Common"); - - var files = commonDirectory.GetFiles(); - - // Copy the files and overwrite destination files if they already exist. - foreach (var file in files) - { - file.CopyTo(_path + @"\" + file.Name, true); - } - } - - public void Start() - { - _serverProcess.Start(); - _serverProcess.WaitForExit(); - } - - public void Stop() - { - _watcherThread.Abort(); - } - - public void Watch() - { - while (true) - { - if (_shouldBeRunning) - { - PrepFiles(); - Start(); - } - - Thread.Sleep(2000); - } - } - } -} diff --git a/Webserver/ServerHandler/ServerHandler/ServerHandler.csproj b/Webserver/ServerHandler/ServerHandler/ServerHandler.csproj deleted file mode 100644 index e55df82b5..000000000 --- a/Webserver/ServerHandler/ServerHandler/ServerHandler.csproj +++ /dev/null @@ -1,92 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {7674049F-5C67-4CD0-AD1F-8F23C718E37B} - WinExe - Properties - ServerHandler - ServerHandler - v4.0 - Client - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - app.manifest - - - - - - - - - - - - - - - - Form - - - Form1.cs - - - - - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - \ No newline at end of file diff --git a/Webserver/ServerHandler/ServerHandler/app.manifest b/Webserver/ServerHandler/ServerHandler/app.manifest deleted file mode 100644 index 423791a64..000000000 --- a/Webserver/ServerHandler/ServerHandler/app.manifest +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Website/LOCWebsite.suo b/Website/LOCWebsite.suo index 738ecd2f8fc778751654d8dae418c9eeee1bee10..25a161edcc6877a93168f1870ffba9db3ea6ab20 100644 GIT binary patch delta 12994 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 delta 13081 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 From 8c2d8790363257e447e1ed80c38af2fd66128d24 Mon Sep 17 00:00:00 2001 From: Chiss Date: Tue, 23 Dec 2014 22:17:39 +1100 Subject: [PATCH 5/6] added ownership of legend particle for legends. --- .../mineplex/core/gadget/gadgets/ParticleLegend.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleLegend.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleLegend.java index 315b387d1..cf6e41eba 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleLegend.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleLegend.java @@ -4,7 +4,9 @@ import org.bukkit.Effect; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.player.PlayerJoinEvent; +import mineplex.core.common.Rank; import mineplex.core.common.util.C; import mineplex.core.gadget.types.ParticleGadget; import mineplex.core.updater.UpdateType; @@ -40,4 +42,13 @@ public class ParticleLegend extends ParticleGadget player.getWorld().playEffect(player.getLocation().add(0, 1, 0), Effect.ENDER_SIGNAL, 0); } } + + @EventHandler + public void legendOwner(PlayerJoinEvent event) + { + if (Manager.getClientManager().Get(event.getPlayer()).GetRank().Has(Rank.LEGEND)) + { + Manager.getDonationManager().Get(event.getPlayer().getName()).AddUnknownSalesPackagesOwned(GetName()); + } + } } From 07cca7a1d4914467900ceafeb2475dc09ef3e57e Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Tue, 23 Dec 2014 06:46:05 -0500 Subject: [PATCH 6/6] Fixed NPE in GameHostManager Fixed CD for creating server. --- .../src/mineplex/core/personalServer/HostServerCommand.java | 2 +- .../src/mineplex/core/personalServer/PersonalServerManager.java | 2 +- .../src/nautilus/game/arcade/managers/GameHostManager.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/HostServerCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/HostServerCommand.java index b4be739be..2c12e1d8d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/HostServerCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/HostServerCommand.java @@ -16,7 +16,7 @@ public class HostServerCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { - if (!Recharge.Instance.use(caller, "Host Server", 30000, true, true)) + if (!Recharge.Instance.use(caller, "Host Server", 30000, false, false)) return; Plugin.hostServer(caller, caller.getName()); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java index 1f15bf26c..763c27f25 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java @@ -67,7 +67,7 @@ public class PersonalServerManager extends MiniPlugin { if (_interfaceItem.equals(event.getPlayer().getItemInHand())) { - if (!Recharge.Instance.use(event.getPlayer(), "Host Server", 30000, true, true)) + if (!Recharge.Instance.use(event.getPlayer(), "Host Server Melon", 30000, false, false)) return; if (_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.LEGEND)) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java index 5d9a1aa85..517aef484 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java @@ -253,7 +253,7 @@ public class GameHostManager implements Listener public boolean isPrivateServer() { - return Manager.GetHost() != null || Manager.GetHost().length() > 0; + return Manager.GetHost() != null && Manager.GetHost().length() > 0; } @EventHandler