Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-05 20:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/sk89q/master'

Browse Source 
# Conflicts:

#	worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
#	worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java
#	worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockType.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java
This commit is contained in:
Jesse Boyd
2018-08-14 01:36:00 +10:00
parent 1601ea07a8 96388df4b0
commit 76a55b7712
18 changed files with 85 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
worldedit-core/src/main/java/com/sk89q/worldedit/world/entity/EntityType.java
View File

@ -48,6 +48,11 @@ public class EntityType {
return getId();
}
@Override
public String toString() {
return getId();
}
@Override
public int hashCode() {
return this.id.hashCode();

5
worldedit-core/src/main/java/com/sk89q/worldedit/world/fluid/FluidType.java
View File

@ -44,6 +44,11 @@ public class FluidType {
return this.id;
}
@Override
public String toString() {
return getId();
}
@Override
public int hashCode() {
return this.id.hashCode();

5
worldedit-core/src/main/java/com/sk89q/worldedit/world/gamemode/GameMode.java
View File

@ -44,6 +44,11 @@ public class GameMode {
return getId();
}
@Override
public String toString() {
return getId();
}
@Override
public int hashCode() {
return this.id.hashCode();

2
worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java
View File

@ -59,7 +59,7 @@ public interface ItemType {
* @return The block representation
*/
@Nullable
default BlockType getBlockType() {
default BlockTypes getBlockType() {
return BlockTypes.get(getId());
}

5
worldedit-core/src/main/java/com/sk89q/worldedit/world/weather/WeatherType.java
View File

@ -44,6 +44,11 @@ public class WeatherType {
return getId();
}
@Override
public String toString() {
return getId();
}
@Override
public int hashCode() {
return this.id.hashCode();