Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pull] main from IntellectualSites:main #540

Merged
merged 3 commits into from
Aug 18, 2023
Merged

[pull] main from IntellectualSites:main #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
443fe8d
Added deprecation
MattBDev Aug 18, 2023
8e60fdb
Merge remote-tracking branch 'origin/main'
MattBDev Aug 18, 2023
ba9dab1
Fixed a typo.
MattBDev Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core/src/main/java/com/plotsquared/core/PlotSquared.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,7 +1281,7 @@ private void checkRoadRegenPersistence() {
}

/**
* Setup the database connection.
* Set up the database connection.
*/
public void setupDatabase() {
try {
Expand Down
4 changes: 4 additions & 0 deletions Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ public class HybridUtils {
private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + HybridUtils.class.getSimpleName());
private static final BlockState AIR = BlockTypes.AIR.getDefaultState();

/**
* Deprecated and likely to be removed in a future release.
*/
@Deprecated(forRemoval = true, since = "7.0.0")
public static HybridUtils manager;
public static Set<BlockVector2> regions;
public static int height;
Expand Down