Skip to content

Commit ac4b587

Browse files
committed
fix: Yaml downgrade; PermissionsEx works again
1 parent c8dd895 commit ac4b587

4 files changed

Lines changed: 4 additions & 8 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>org.yaml</groupId>
5555
<artifactId>snakeyaml</artifactId>
56-
<version>2.0</version>
56+
<version>1.7</version>
5757
<type>jar</type>
5858
<scope>compile</scope>
5959
</dependency>

src/main/java/org/bukkit/craftbukkit/CraftServer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.bukkit.util.config.Configuration;
4242
import org.bukkit.util.config.ConfigurationNode;
4343
import org.bukkit.util.permissions.DefaultPermissions;
44-
import org.yaml.snakeyaml.LoaderOptions;
4544
import org.yaml.snakeyaml.Yaml;
4645
import org.yaml.snakeyaml.constructor.SafeConstructor;
4746
import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -70,7 +69,7 @@ public final class CraftServer implements Server {
7069
protected final ServerConfigurationManager server;
7170
private final Map<String, World> worlds = new LinkedHashMap<String, World>();
7271
private final Configuration configuration;
73-
private final Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
72+
private final Yaml yaml = new Yaml(new SafeConstructor());
7473
private boolean shuttingdown = false;
7574
private final List<String> hiddenCommands = new ArrayList<>(); //Project Poseidon - Create variable
7675

src/main/java/org/bukkit/plugin/PluginDescriptionFile.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.bukkit.Bukkit;
44
import org.bukkit.permissions.Permission;
5-
import org.yaml.snakeyaml.LoaderOptions;
65
import org.yaml.snakeyaml.Yaml;
76
import org.yaml.snakeyaml.constructor.SafeConstructor;
87

@@ -19,7 +18,7 @@
1918
* Provides access to a Plugins description file, plugin.yaml
2019
*/
2120
public final class PluginDescriptionFile {
22-
private static final Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions()));
21+
private static final Yaml yaml = new Yaml(new SafeConstructor());
2322
private String name = null;
2423
private String main = null;
2524
private String classLoaderOf = null;

src/main/java/org/bukkit/util/config/Configuration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.bukkit.util.config;
22

33
import org.yaml.snakeyaml.DumperOptions;
4-
import org.yaml.snakeyaml.LoaderOptions;
54
import org.yaml.snakeyaml.Yaml;
65
import org.yaml.snakeyaml.constructor.SafeConstructor;
76
import org.yaml.snakeyaml.introspector.Property;
@@ -58,7 +57,7 @@ public Configuration(File file) {
5857
options.setIndent(4);
5958
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
6059

61-
yaml = new Yaml(new SafeConstructor(new LoaderOptions()), new EmptyNullRepresenter(new DumperOptions()), options);
60+
yaml = new Yaml(new SafeConstructor(), new EmptyNullRepresenter(new DumperOptions()), options);
6261

6362
this.file = file;
6463
}
@@ -190,7 +189,6 @@ public static ConfigurationNode getEmptyNode() {
190189
class EmptyNullRepresenter extends Representer {
191190

192191
public EmptyNullRepresenter(DumperOptions options) {
193-
super(options);
194192
this.nullRepresenter = new EmptyRepresentNull();
195193
}
196194

0 commit comments

Comments
 (0)