Merge branch 'master' of bitbucket.org:CrushedPixel/cpreplaymod

Conflicts:
	src/main/java/eu/crushedpixel/replaymod/replay/ReplaySender.java
This commit is contained in:
CrushedPixel
2015-05-11 16:55:07 +02:00
11 changed files with 764 additions and 521 deletions

View File

@@ -13,6 +13,7 @@ import eu.crushedpixel.replaymod.registry.UploadedFileHandler;
import eu.crushedpixel.replaymod.renderer.SafeEntityRenderer;
import eu.crushedpixel.replaymod.replay.ReplaySender;
import eu.crushedpixel.replaymod.settings.ReplaySettings;
import eu.crushedpixel.replaymod.utils.ReplayFile;
import eu.crushedpixel.replaymod.utils.ReplayFileIO;
import net.minecraft.client.Minecraft;
import net.minecraftforge.common.MinecraftForge;
@@ -158,7 +159,7 @@ public class ReplayMod {
File folder = ReplayFileIO.getReplayFolder();
for(File f : folder.listFiles()) {
if(("." + FilenameUtils.getExtension(f.getAbsolutePath())).equals(ConnectionEventHandler.TEMP_FILE_EXTENSION)) {
if(("." + FilenameUtils.getExtension(f.getAbsolutePath())).equals(ReplayFile.TEMP_FILE_EXTENSION)) {
f.delete();
}
}