Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-22 09:08:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.x' into 2.x

Browse Source
This commit is contained in:
md678685 2019-07-28 16:18:00 +01:00
commit ac8b8861cb
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java
View File

@ -18,6 +18,7 @@ import org.bukkit.util.Vector;
import java.io.File;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.function.Predicate;
@ -152,6 +153,31 @@ public class FakeWorld implements World {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean addPluginChunkTicket(int i, int i1, Plugin plugin) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean removePluginChunkTicket(int i, int i1, Plugin plugin) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void removePluginChunkTickets(Plugin plugin) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Collection<Plugin> getPluginChunkTickets(int i, int i1) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Map<Plugin, Collection<Chunk>> getPluginChunkTickets() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public Item dropItem(Location lctn, ItemStack is) {
throw new UnsupportedOperationException("Not supported yet.");

3
Essentials/src/com/earth2me/essentials/utils/VersionUtil.java
View File

@ -24,8 +24,9 @@ public class VersionUtil {
public static final BukkitVersion v1_14_1_R01 = BukkitVersion.fromString("1.14.1-R0.1-SNAPSHOT");
public static final BukkitVersion v1_14_2_R01 = BukkitVersion.fromString("1.14.2-R0.1-SNAPSHOT");
public static final BukkitVersion v1_14_3_R01 = BukkitVersion.fromString("1.14.3-R0.1-SNAPSHOT");
public static final BukkitVersion v1_14_4_R01 = BukkitVersion.fromString("1.14.4-R0.1-SNAPSHOT");
private static final Set<BukkitVersion> supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_3_R01);
private static final Set<BukkitVersion> supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01);
private static BukkitVersion serverVersion = null;

2
pom.xml
View File

@ -58,7 +58,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.14.3-R0.1-SNAPSHOT</version>
<version>1.14.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>