Upstream/Brewery
1
0
Fork 1
mirror of https://github.com/DieReicheErethons/Brewery.git synced 2024-11-22 11:35:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed too much drunk-pushing in 1.9

Browse Source
This commit is contained in:
Sn0wStorm 2016-04-23 18:51:29 +02:00
parent 468b90be43
commit 0f38ef008f
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/dre/brewery/BPlayer.java
View File

@ -229,8 +229,13 @@ public class BPlayer {
if (time == 0) {
// push him only to the side? or any direction
// like now
push.setX(Math.random() - 0.5);
push.setZ(Math.random() - 0.5);
if (P.use1_9) { // Pushing is way stronger in 1.9
push.setX((Math.random() - 0.5) / 2.0);
push.setZ((Math.random() - 0.5) / 2.0);
} else {
push.setX(Math.random() - 0.5);
push.setZ(Math.random() - 0.5);
}
player.setVelocity(push);
} else if (time < 0 && time > -10) {
// push him some more in the same direction
@ -574,4 +579,4 @@ public class BPlayer {
return -getQuality() + 11;
}
}
}

4
src/com/dre/brewery/Barrel.java
View File

@ -129,7 +129,7 @@ public class Barrel implements InventoryHolder {
}
} catch (Throwable e) {
P.p.errorLog("Failed to Check WorldGuard for Barrel Open Permissions!");
P.p.errorLog("Brewery was tested with version 5.8 to 6.0 of WorldGuard!");
P.p.errorLog("Brewery was tested with version 5.8 to 6.1 of WorldGuard!");
P.p.errorLog("Disable the WorldGuard support in the config and do /brew reload");
e.printStackTrace();
P.p.msg(player, "&cError opening Barrel, please report to an Admin!");
@ -146,7 +146,7 @@ public class Barrel implements InventoryHolder {
}
} catch (Throwable e) {
P.p.errorLog("Failed to Check GriefPrevention for Barrel Open Permissions!");
P.p.errorLog("Brewery only works with the latest release of GriefPrevention (7.8)");
P.p.errorLog("Brewery was tested with GriefPrevention 14.5.1");
P.p.errorLog("Disable the GriefPrevention support in the config and do /brew reload");
e.printStackTrace();
P.p.msg(player, "&cError opening Barrel, please report to an Admin!");

2
src/com/dre/brewery/P.java
View File

@ -70,7 +70,7 @@ public class P extends JavaPlugin {
useUUID = !v.matches(".*1\\.[0-6].*") && !v.matches(".*1\\.7\\.[0-5].*");
use1_9 = !v.matches(".*1\\.[0-8].*");
if (use1_9) {
log("&cExperimental support for Bukkit 1.9 enabled.");
log("&eExperimental support for Bukkit 1.9 enabled.");
}
// load the Config