Upstream/PurpleIRC-spigot
1
0
Fork 0
mirror of https://github.com/cnaude/PurpleIRC-spigot.git synced 2024-11-05 18:09:37 +01:00
Code Issues Projects Releases Wiki Activity

Minecraft 1.8.6 compatibility.

Browse Source
This commit is contained in:
cnaude 2015-05-25 16:17:35 -07:00
parent 1699a7fa3a
commit e7bc3f5f85
4 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dependency-reduced-pom.xml
View File

@ -133,7 +133,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.8.4</version> <version>1.8.6</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -148,12 +148,6 @@
<version>1.8.4</version> <version>1.8.4</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>spigot-185</artifactId>
<version>1.8.5</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
@ -368,7 +362,7 @@
<properties> <properties>
<build.number>SNAPSHOT</build.number> <build.number>SNAPSHOT</build.number>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bukkit.version>1.8.4</bukkit.version> <bukkit.version>1.8.6</bukkit.version>
</properties> </properties>
</project> </project>

10
pom.xml
View File

@ -6,7 +6,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Bukkit API Version, change if out dated --> <!-- Bukkit API Version, change if out dated -->
<bukkit.version>1.8.4</bukkit.version> <bukkit.version>1.8.6</bukkit.version>
<build.number>SNAPSHOT</build.number> <build.number>SNAPSHOT</build.number>
</properties> </properties>
@ -93,14 +93,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>spigot-185</artifactId>
<version>1.8.5</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<!-- PircBotX --> <!-- PircBotX -->
<dependency> <dependency>
<groupId>com.cnaude.pircbotx</groupId> <groupId>com.cnaude.pircbotx</groupId>

2
src/main/java/com/cnaude/purpleirc/Utilities/NetPacket_184_185.java → src/main/java/com/cnaude/purpleirc/Utilities/NetPacket_184_185_186.java
View File

@ -30,7 +30,7 @@ import net.minecraft.server.v1_8_R3.PlayerInteractManager;
* *
* @author cnaude * @author cnaude
*/ */
public class NetPacket_184_185 { public class NetPacket_184_185_186 {
public static PacketContainer add(String displayName) { public static PacketContainer add(String displayName) {
UUID uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + displayName).getBytes(Charsets.UTF_8)); UUID uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + displayName).getBytes(Charsets.UTF_8));

8
src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
View File

@ -135,13 +135,15 @@ public class NetPackets {
} catch (Exception ex) { } catch (Exception ex) {
plugin.logError("tabPacket: " + ex.getMessage()); plugin.logError("tabPacket: " + ex.getMessage());
} }
} else if (version.contains("MC: 1.8.4") || version.contains("MC: 1.8.5")) { } else if (version.contains("MC: 1.8.4")
|| version.contains("MC: 1.8.5")
|| version.contains("MC: 1.8.6")) {
try { try {
if (add) { if (add) {
return NetPacket_184_185.add(displayName); return NetPacket_184_185_186.add(displayName);
} else { } else {
plugin.logDebug("T: Removing: " + name); plugin.logDebug("T: Removing: " + name);
return NetPacket_184_185.rem(displayName); return NetPacket_184_185_186.rem(displayName);
} }
} catch (Exception ex) { } catch (Exception ex) {
plugin.logError("tabPacket: " + ex.getMessage()); plugin.logError("tabPacket: " + ex.getMessage());