From 17dda7f032b93f43ce9104b8d83056c05f0be7db Mon Sep 17 00:00:00 2001
From: "Kristian S. Stangeland" <kr_stang@hotmail.com>
Date: Fri, 18 Apr 2014 00:27:25 +0200
Subject: [PATCH] Better to fail updating the version number than crashing.

If we update the number, we have to also use the "empty file" trick
to remove the old file, which will crash ProtocolLib on the first
reload. It takes a second reload for it to function at all.

It's much better to take the hit on the version number, and avoid
this issue altogether. The update method simply wasn't designed for
plugins with version numbers in their file name.
---
 .../comphenix/protocol/metrics/Updater.java   | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Updater.java b/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Updater.java
index 75782240..f9e08187 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Updater.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Updater.java
@@ -599,18 +599,14 @@ public class Updater {
 
 		private void performUpdate() {
 			if ((Updater.this.versionLink != null) && (Updater.this.type != UpdateType.NO_DOWNLOAD)) {
-			    final String oldFileName = Updater.this.file.getName();
 			    final File pluginFolder = plugin.getDataFolder().getParentFile();
 				File destinationFolder = new File(pluginFolder, updateFolder);
-			    String name = versionFileName; 
+			    String name = Updater.this.file.getName(); 
 			    
-			    // Oh - this is a problem - we'll have to create an empty plugin to remove the old version (after two reloads)
-			    if (!versionFileName.equals(oldFileName)) {
-					createEmptyFile(new File(destinationFolder, oldFileName));
-					destinationFolder = pluginFolder;
-					plugin.getLogger().info("Creating empty plugin file. Note that the server may need to be reloaded twice.");
-			    }
-			      
+			    // If it's a zip file, it shouldn't be downloaded as the plugin's name
+			    if (Updater.this.versionLink.endsWith(".zip")) {
+			        name = versionFileName;
+			    }	    
 				Updater.this.saveFile(
 			    	destinationFolder, 
 			    	name, 
@@ -620,14 +616,5 @@ public class Updater {
 			    Updater.this.result = UpdateResult.UPDATE_AVAILABLE;
 			}
 		}
-		
-		private void createEmptyFile(File emptyFile) {
-			try {
-				emptyFile.delete();
-				Files.touch(emptyFile);
-			} catch (IOException e) {
-				throw new RuntimeException("Cannot create empty JAR-file.", e);
-			}
-		}
     }
 }