SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed block data for FallingBlock disguises

Browse Source
This commit is contained in:
NavidK0 2015-07-01 16:02:57 -04:00
parent f4ec0fc6f6
commit aee904200b
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@ -13,6 +13,8 @@ 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.7-R0.1-SNAPSHOT'
ext.disguisesVersion = '8.5.1'
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
repositories { repositories {
@ -40,7 +42,7 @@ task sourceJar (type : Jar, dependsOn: classes) {
from sourceSets.main.allSource from sourceSets.main.allSource
} }
task javadocJar (type: Jar, dependsOn: javadoc) { // (1) task javadocJar (type: Jar, dependsOn: javadoc) {
classifier = 'javadoc' classifier = 'javadoc'
from javadoc.destinationDir from javadoc.destinationDir
} }
@ -60,12 +62,12 @@ publishing {
mavenJava(MavenPublication) { mavenJava(MavenPublication) {
groupId 'LibsDisguises' groupId 'LibsDisguises'
artifactId 'LibsDisguises' artifactId 'LibsDisguises'
version '8.5-SNAPSHOT' version disguisesVersion + '-SNAPSHOT'
from components.java from components.java
artifact (sourceJar) { artifact sourceJar {
classifier = 'sources' classifier = 'sources'
} }
artifact (javadocJar) { artifact javadocJar {
classifier = 'javadoc' classifier = 'javadoc'
} }
} }
@ -84,7 +86,7 @@ artifactory {
} }
defaults { defaults {
publications('mavenJava') publications('mavenJava')
} }
} }
resolve { resolve {
repoKey = 'repo' repoKey = 'repo'

3
src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java
View File

@ -320,13 +320,12 @@ public class PacketsManager {
mods.write(9, pitch); mods.write(9, pitch);
spawnPackets[0].getDataWatcherModifier().write(0, spawnPackets[0].getDataWatcherModifier().write(0,
createDataWatcher(player, WrappedDataWatcher.getEntityWatcher(disguisedEntity), disguise.getWatcher())); createDataWatcher(player, WrappedDataWatcher.getEntityWatcher(disguisedEntity), disguise.getWatcher()));
} else if (disguise.getType().isMisc()) { } else if (disguise.getType().isMisc()) {
MiscDisguise msc = (MiscDisguise)disguise; MiscDisguise msc = (MiscDisguise)disguise;
int id = disguise.getType().getEntityId(); int id = disguise.getType().getEntityId();
int data = msc.getData(); int data = msc.getData();
if (disguise.getType() == DisguiseType.FALLING_BLOCK) { if (disguise.getType() == DisguiseType.FALLING_BLOCK) {
data = msc.getData(); //No data values for now, switch to NBT only has been painful data = msc.getId() + (msc.getData() << 12);
} else if (disguise.getType() == DisguiseType.FISHING_HOOK && data == 0) { } else if (disguise.getType() == DisguiseType.FISHING_HOOK && data == 0) {
// If the MiscDisguise data isn't set. Then no entity id was provided, so default to the owners entity id // If the MiscDisguise data isn't set. Then no entity id was provided, so default to the owners entity id
data = disguisedEntity.getEntityId(); data = disguisedEntity.getEntityId();

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.5 version: 8.5.1
author: libraryaddict author: libraryaddict
authors: [Byteflux, Navid K.] authors: [Byteflux, Navid K.]
depend: [ProtocolLib] depend: [ProtocolLib]