Upstream/LibsDisguises
1
0
Fork 1
mirror of https://github.com/libraryaddict/LibsDisguises.git synced 2024-12-15 15:28:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated for 1.8.8.

Browse Source 
Compiled against ProtocolLib 3.6.5.

Fixed a nullpointerexception In Disguise when the disguise would rarely despawn causing the entity to be invalid.
This commit is contained in:
NavidK0 2015-08-01 19:24:18 -04:00
parent bdb436711f
commit 037da7e980
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -11,9 +11,9 @@ plugins {
println 'Compiling LibsDisguises via Gradle ver. ' + gradle.gradleVersion println 'Compiling LibsDisguises via Gradle ver. ' + gradle.gradleVersion
sourceCompatibility = '1.7' sourceCompatibility = '1.7'
ext.spigotVersion = '1.8.7-R0.1-SNAPSHOT' ext.spigotVersion = '1.8.8-R0.1-SNAPSHOT'
ext.disguisesVersion = '8.6.2' ext.disguisesVersion = '8.6.3'
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
@ -100,7 +100,7 @@ ant.get src: 'https://www.dropbox.com/s/1ofgubrldjwamnk/spigot.jar?dl=1', dest:
dependencies { dependencies {
compile 'org.bukkit:bukkit:' + project.ext.spigotVersion compile 'org.bukkit:bukkit:' + project.ext.spigotVersion
compile 'com.comphenix.protocol:ProtocolLib:3.6.4-SNAPSHOT' compile 'com.comphenix.protocol:ProtocolLib:3.6.5-SNAPSHOT'
compile files( compile files(
'libs/spigot.jar' 'libs/spigot.jar'
) )

2
src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
View File

@ -397,8 +397,10 @@ public abstract class Disguise {
/** /**
* Internal use * Internal use
* @return
*/ */
public boolean isRemoveDisguiseOnDeath() { public boolean isRemoveDisguiseOnDeath() {
if (getEntity() == null) return true;
return getEntity() instanceof Player ? return getEntity() instanceof Player ?
(!((Player) getEntity()).isOnline() ? !isKeepDisguiseOnPlayerLogout() : !isKeepDisguiseOnPlayerDeath()) (!((Player) getEntity()).isOnline() ? !isKeepDisguiseOnPlayerLogout() : !isKeepDisguiseOnPlayerDeath())

2
src/main/resources/plugin.yml
View File

@ -1,6 +1,6 @@
name: LibsDisguises name: LibsDisguises
main: me.libraryaddict.disguise.LibsDisguises main: me.libraryaddict.disguise.LibsDisguises
version: 8.6.2 version: 8.6.3
author: libraryaddict author: libraryaddict
authors: [Byteflux, Navid K.] authors: [Byteflux, Navid K.]
depend: [ProtocolLib] depend: [ProtocolLib]