Upstream/Brewery
1
0
Fork 1
mirror of https://github.com/DieReicheErethons/Brewery.git synced 2025-03-20 14:39:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed longer passing out/overdrinking

Browse Source
This commit is contained in:
Sn0wStorm 2016-05-26 21:26:51 +02:00
parent 85acdcdbb6
commit 816dacf76b
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,6 @@ public class BPlayer {
private int quality = 0;// = quality of drunkeness * drunkeness
private int drunkeness = 0;// = amount of drunkeness
private boolean passedOut = false;// if kicked because of drunkeness
private int offlineDrunk = 0;// drunkeness when gone offline
private Vector push = new Vector(0, 0, 0);
private int time = 20;
@ -43,11 +42,10 @@ public class BPlayer {
}
// reading from file
public BPlayer(String name, int quality, int drunkeness, int offlineDrunk, Boolean passedOut) {
public BPlayer(String name, int quality, int drunkeness, int offlineDrunk) {
this.quality = quality;
this.drunkeness = drunkeness;
this.offlineDrunk = offlineDrunk;
this.passedOut = passedOut;
players.put(name, this);
}
@ -254,7 +252,6 @@ public class BPlayer {
public void passOut(Player player) {
player.kickPlayer(P.p.languageReader.get("Player_DrunkPassOut"));
offlineDrunk = drunkeness;
passedOut = true;
}
@ -272,11 +269,7 @@ public class BPlayer {
return 3;
}
}
if (drunkeness <= 80) {
if (passedOut) {
// he has suffered enough. Let him through
return 0;
}
if (drunkeness <= 90) {
if (Math.random() > 0.4) {
return 0;
} else {
@ -284,12 +277,10 @@ public class BPlayer {
}
}
if (drunkeness <= 100) {
if (!passedOut) {
if (Math.random() > 0.6) {
return 0;
} else {
return 2;
}
if (Math.random() > 0.6) {
return 0;
} else {
return 2;
}
}
return 3;
@ -331,7 +322,6 @@ public class BPlayer {
}
offlineDrunk = 0;
passedOut = false;
}
public void disconnecting() {
@ -534,9 +524,6 @@ public class BPlayer {
if (bPlayer.offlineDrunk != 0) {
section.set("offDrunk", bPlayer.offlineDrunk);
}
if (bPlayer.passedOut) {
section.set("passedOut", true);
}
}
}

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

@ -443,9 +443,8 @@ public class P extends JavaPlugin {
int quality = section.getInt(name + ".quality");
int drunk = section.getInt(name + ".drunk");
int offDrunk = section.getInt(name + ".offDrunk", 0);
boolean passedOut = section.getBoolean(name + ".passedOut", false);
new BPlayer(name, quality, drunk, offDrunk, passedOut);
new BPlayer(name, quality, drunk, offDrunk);
}
}