LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-03 05:25:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Collide traits only on same level

Browse Source
This commit is contained in:
Jindra Petřík
2016-09-17 14:56:09 +02:00
parent 8a0223a02a
commit 9bb7c01bc8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/ConstVarNameMultinameUsage.java
View File

@@ -38,7 +38,7 @@ public class ConstVarNameMultinameUsage extends ConstVarMultinameUsage implement
public boolean collides(MultinameUsage other) {
if ((other instanceof ConstVarNameMultinameUsage) || (other instanceof MethodNameMultinameUsage)) {
TraitMultinameUsage otherTrait = (TraitMultinameUsage) other;
if (otherTrait.classIndex == classIndex && otherTrait.traitsType == traitsType) {
if (otherTrait.classIndex == classIndex && otherTrait.traitsType == traitsType && otherTrait.parentTraitIndex == parentTraitIndex) {
if (other.sameMultinameName(this)) {
return true;
}

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/usages/MethodNameMultinameUsage.java
View File

@@ -38,7 +38,7 @@ public class MethodNameMultinameUsage extends MethodMultinameUsage implements De
public boolean collides(MultinameUsage other) {
if ((other instanceof MethodNameMultinameUsage) || (other instanceof ConstVarNameMultinameUsage)) {
TraitMultinameUsage otherTrait = (TraitMultinameUsage) other;
if (otherTrait.classIndex == classIndex && otherTrait.traitsType == traitsType) {
if (otherTrait.classIndex == classIndex && otherTrait.traitsType == traitsType && otherTrait.parentTraitIndex == parentTraitIndex) {
if (other.sameMultinameName(this)) {
return true;
}