Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-01 06:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix binding order

Browse Source
This commit is contained in:
Jesse Boyd 2019-04-01 23:55:15 +11:00
parent 64a134a9ee
commit c820406e8c
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java
View File

@ -357,7 +357,7 @@ public class ForwardExtentCopy implements Operation {
.stream()
.filter(entity -> entity.getState() != null &&
!entity.getState().getType().getId().equals("minecraft:player") &&
region.contains(entity.getLocation().toVector()))
region.contains(entity.getLocation().toBlockPoint()))
.collect(Collectors.toList());
} else {
entities = new ArrayList<>();

9
worldedit-core/src/main/java/com/sk89q/worldedit/util/command/parametric/BindingMap.java
View File

@ -115,21 +115,26 @@ public class BindingMap implements Binding {
*/
private BoundMethod match(ParameterData pd) {
Type type = pd.getType();
BoundMethod result = null;
while (type != null) {
List<BoundMethod> methods = bindings.get(type);
if (methods != null) {
for (BoundMethod binding : methods) {
if (binding.classifier != null) {
if (pd.getClassifier() != null && pd.getClassifier().annotationType().equals(binding.classifier)) {
if (binding.type == null || binding.type.equals(type)) {
if (binding.type == null) {
result = binding;
} else if (binding.type.equals(type)) {
return binding;
}
}
} else if (binding.type.equals(type)) {
return binding;
if (result == null) result = binding;
}
}
}
if (result != null) return result;
type = (type instanceof Class) ? ((Class) type).getSuperclass() : null;
}
throw new RuntimeException("Unknown type " + pd.getType());