EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'breaking' into DenyTeleportBugfix

Browse Source
This commit is contained in:
mindw0rm
2019-10-22 17:20:43 +02:00
parent ae1273a7f3 5741d5f6a0
commit e5e522bc31
11 changed files with 77 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Bukkit/build.gradle
View File

@ -48,10 +48,10 @@ shadowJar {
include(dependency(":Core"))
// update notification stuff
include(dependency("com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT"))
include(dependency("com.squareup.retrofit2:retrofit:2.4.0"))
include(dependency("com.squareup.okhttp3:okhttp:3.14.0"))
include(dependency("com.squareup.okio:okio:2.2.2"))
include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.30"))
include(dependency("com.squareup.retrofit2:retrofit:2.6.2"))
include(dependency("com.squareup.okhttp3:okhttp:4.2.2"))
include(dependency("com.squareup.okio:okio:2.4.1"))
include(dependency("org.jetbrains.kotlin:kotlin-stdlib:1.3.50"))
include(dependency("io.papermc:paperlib:1.0.2"))
include(dependency("net.kyori:text-adapter-bukkit:3.0.3"))
}

2
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
View File

@ -702,7 +702,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
+ " is using Offline Mode UUIDs either because of user preference, or because you are using an old version of "
+ "Bukkit");
} else {
PlotSquared.log(Captions.PREFIX + " " + getPluginName() + " is using online UUIDs");
PlotSquared.log(Captions.PREFIX + "" + getPluginName() + " is using online UUIDs");
}
if (Settings.UUID.USE_SQLUUIDHANDLER) {
return new SQLUUIDHandler(wrapper);

3
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
View File

@ -2039,13 +2039,14 @@ import java.util.regex.Pattern;
if (type == Material.AIR) {
type = offType;
}
// in the following, lb needs to have the material of the item in hand i.e. type
lb = new BukkitLazyBlock(PlotBlock.get(type.toString()));
if (type.isBlock()) {
location = BukkitUtil
.getLocation(block.getRelative(event.getBlockFace()).getLocation());
eventType = PlayerBlockEventType.PLACE_BLOCK;
break;
}
lb = new BukkitLazyBlock(PlotBlock.get(type.toString()));
if (type.toString().toLowerCase().endsWith("egg")) {
eventType = PlayerBlockEventType.SPAWN_MOB;
} else {

1
Bukkit/src/main/resources/plugin.yml
View File

@ -6,6 +6,7 @@ load: STARTUP
description: >
Easy, yet powerful Plot World generation and management.
authors: [Citymonstret, Empire92, MattBDev, dordsor21]
website: https://github.com/IntellectualSites/
softdepend: [BarAPI, CameraAPI, Vault]
loadbefore: [MultiWorld, Multiverse-Core]
depend: [WorldEdit]