SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #942 from AwesomePowered/1.6.x

Browse Source 
1.12 update
This commit is contained in:
Trent Hensler 2017-06-22 10:38:18 -07:00 committed by GitHub
commit dabe2f1445
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -73,7 +73,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.11-R0.1-SNAPSHOT</version> <version>1.12-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>

2
src/main/java/com/massivecraft/factions/zcore/MPlugin.java
View File

@ -133,7 +133,7 @@ public abstract class MPlugin extends JavaPlugin {
while ((read = defLangStream.read(bytes)) != -1) { while ((read = defLangStream.read(bytes)) != -1) {
out.write(bytes, 0, read); out.write(bytes, 0, read);
} }
YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defLangStream); YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(new BufferedReader(new InputStreamReader(defLangStream)));
TL.setFile(defConfig); TL.setFile(defConfig);
} }
} catch (IOException e) { } catch (IOException e) {